diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 2fee84b9b73..3555d024434 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 2fee84b9b73d88b0ff713e78b1b9d759fd8d37fc
+Subproject commit 3555d024434f071bd9abf9f5bde3b8dd404fc1ce
diff --git a/components/wpa_supplicant/src/pasn/pasn_initiator.c b/components/wpa_supplicant/src/pasn/pasn_initiator.c
index c75983c1ae5..47faab5e619 100644
--- a/components/wpa_supplicant/src/pasn/pasn_initiator.c
+++ b/components/wpa_supplicant/src/pasn/pasn_initiator.c
@@ -54,7 +54,7 @@ void pasn_initiator_pmksa_cache_remove(struct rsn_pmksa_cache *pmksa,
 {
 	struct rsn_pmksa_cache_entry *entry;
 
-	entry = pmksa_cache_get(pmksa, bssid, NULL, NULL);
+	entry = pmksa_cache_get(pmksa, bssid, NULL, NULL, NULL);
 	if (!entry)
 		return;
 
@@ -68,7 +68,7 @@ int pasn_initiator_pmksa_cache_get(struct rsn_pmksa_cache *pmksa,
 {
 	struct rsn_pmksa_cache_entry *entry;
 
-	entry = pmksa_cache_get(pmksa, bssid, NULL, NULL);
+	entry = pmksa_cache_get(pmksa, bssid, NULL, NULL, NULL);
 	if (entry) {
 		os_memcpy(pmkid, entry->pmkid, PMKID_LEN);
 		os_memcpy(pmk, entry->pmk, entry->pmk_len);
@@ -627,7 +627,8 @@ static struct wpabuf * wpas_pasn_build_auth_1(struct pasn_data *pasn,
 	} else if (wrapped_data != WPA_PASN_WRAPPED_DATA_NO) {
 		struct rsn_pmksa_cache_entry *pmksa;
 
-		pmksa = pmksa_cache_get(pasn->pmksa, pasn->peer_addr, NULL, NULL);
+		pmksa = pmksa_cache_get(pasn->pmksa, pasn->peer_addr, pasn->own_addr,
+					NULL, NULL);
 		if (pmksa && pasn->custom_pmkid_valid)
 			pmkid = pasn->custom_pmkid;
 		else if (pmksa)
@@ -900,7 +901,7 @@ static int wpas_pasn_set_pmk(struct pasn_data *pasn,
 			pmkid = rsn_data->pmkid;
 		}
 
-		pmksa = pmksa_cache_get(pasn->pmksa, pasn->peer_addr,
+		pmksa = pmksa_cache_get(pasn->pmksa, pasn->peer_addr, pasn->own_addr,
 					pmkid, NULL);
 		if (pmksa) {
 			wpa_printf(MSG_DEBUG, "PASN: Using PMKSA");