diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wps.c b/components/wpa_supplicant/esp_supplicant/src/esp_wps.c
index c8a0f02ad8..84e230f16d 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_wps.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_wps.c
@@ -821,6 +821,10 @@ int wps_finish(void)
         /* WPS finished, dequeue all timers */
         wps_delete_timer();
 
+        esp_wifi_unset_appie_internal(WIFI_APPIE_WPS_PR);
+        esp_wifi_unset_appie_internal(WIFI_APPIE_WPS_AR);
+        esp_wifi_set_wps_cb_internal(NULL);
+
         if (sm->ap_cred_cnt == 1) {
             wifi_config_t *config = os_zalloc(sizeof(wifi_config_t));