diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 1bb54420316..54e21041481 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 1bb54420316483d1def36d6f86ad6ff7243cb4f3
+Subproject commit 54e2104148159389bf5b07b4bdfa3957b6a5e603
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_nan_supplicant.c b/components/wpa_supplicant/esp_supplicant/src/esp_nan_supplicant.c
index d7b797e975f..93aa5aebf3b 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_nan_supplicant.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_nan_supplicant.c
@@ -761,11 +761,7 @@ int nan_pasn_followup_decrypt_keys(const uint8_t *shared_key_attr,
     key_desc = (const struct wpa_eapol_key *)(body + 1);
     key_info = WPA_GET_BE16(key_desc->key_info);
 
-    if (!(key_info & WPA_KEY_INFO_KEY_TYPE)) {
-        wpa_printf(MSG_INFO,
-                   "NAN: Follow-up frame does not contain pairwise key");
-        return -1;
-    }
+    /* iPhone/hostap set Key Type=0 (NIK is not a pairwise key); don't require the bit. */
     if (!(key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) {
         wpa_printf(MSG_INFO,
                    "NAN: Follow-up frame does not contain encrypted key data");