diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 634b283d88..695ac5aea8 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 634b283d88f457e7f8857ffa35d56c86bbafefe9
+Subproject commit 695ac5aea8149bf51afd20890f89ae14466ecffb
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 546f38da4c..88d43e7e59 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
@@ -256,7 +256,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;
@@ -267,6 +266,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();
 }