diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index fda241ceff..eacd07f165 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit fda241ceff83a34609c9fc132d3e19916969f2c8
+Subproject commit eacd07f165fee254b37ee5819208e1185549ec59
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c b/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
index 32f8efec0e..5d1281f6d8 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
@@ -294,7 +294,6 @@ static void wpa_sta_disconnected_cb(uint8_t reason_code)
     case WIFI_REASON_ASSOC_FAIL:
     case WIFI_REASON_CONNECTION_FAIL:
     case WIFI_REASON_HANDSHAKE_TIMEOUT:
-        esp_wpa3_free_sae_data();
         wpa_sta_clear_curr_pmksa();
         wpa_sm_notify_disassoc(&gWpaSm);
         break;
@@ -308,6 +307,7 @@ static void wpa_sta_disconnected_cb(uint8_t reason_code)
     owe_deinit();
 #endif /* CONFIG_OWE_STA */
 
+    esp_wpa3_free_sae_data();
     supplicant_sta_disconn_handler(reason_code);
 }