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 88d43e7e59..b60627b039 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
@@ -312,7 +312,8 @@ static bool hostap_sta_join(void **sta, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len, bo
     }
 
     if (*sta) {
-       ap_free_sta(hapd, *sta);
+        ap_free_sta(hapd, *sta);
+        *sta = NULL;
     }
     sta_info = ap_sta_add(hapd, bssid);
     if (!sta_info) {
diff --git a/components/wpa_supplicant/src/rsn_supp/wpa.c b/components/wpa_supplicant/src/rsn_supp/wpa.c
index 8104a71a6d..db648dda38 100644
--- a/components/wpa_supplicant/src/rsn_supp/wpa.c
+++ b/components/wpa_supplicant/src/rsn_supp/wpa.c
@@ -2481,6 +2481,7 @@ int wpa_set_bss(char *macddr, char * bssid, u8 pairwise_cipher, u8 group_cipher,
     sm->ap_notify_completed_rsne = esp_wifi_sta_is_ap_notify_completed_rsne_internal();
     sm->use_ext_key_id = (sm->proto == WPA_PROTO_WPA);
     pmksa_cache_clear_current(sm);
+    sm->sae_pwe = esp_wifi_sta_get_config_sae_pwe_h2e_internal();
 
     struct rsn_pmksa_cache_entry *pmksa = NULL;
     if (use_pmk_cache) {