diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_hostpad_wps.c b/components/wpa_supplicant/esp_supplicant/src/esp_hostpad_wps.c
index 8ee6678922..044ca46223 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_hostpad_wps.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_hostpad_wps.c
@@ -220,7 +220,7 @@ int esp_wifi_ap_wps_enable(const esp_wps_config_t *config)
     return ret;
 }
 
-static int wifi_ap_wps_disable_internal(void)
+int wifi_ap_wps_disable_internal(void)
 {
     struct wps_sm *sm = gWpsSm;
 
diff --git a/components/wpa_supplicant/src/ap/wpa_auth.c b/components/wpa_supplicant/src/ap/wpa_auth.c
index 24def33584..513ec9fa82 100644
--- a/components/wpa_supplicant/src/ap/wpa_auth.c
+++ b/components/wpa_supplicant/src/ap/wpa_auth.c
@@ -2620,21 +2620,6 @@ send_resp:
     return true;
 }
 
-#ifdef CONFIG_WPS_REGISTRAR
-static void ap_free_sta_timeout(void *ctx, void *data)
-{
-    struct hostapd_data *hapd = (struct hostapd_data *) ctx;
-    u8 *addr = (u8 *) data;
-    struct sta_info *sta = ap_get_sta(hapd, addr);
-
-    if (sta) {
-        ap_free_sta(hapd, sta);
-    }
-
-    os_free(addr);
-}
-#endif
-
 bool wpa_ap_remove(u8* bssid)
 {
     struct hostapd_data *hapd = hostapd_get_hapd_data();
@@ -2657,19 +2642,6 @@ bool wpa_ap_remove(u8* bssid)
         return true;
     }
 #endif /* CONFIG_SAE */
-
-#ifdef CONFIG_WPS_REGISTRAR
-    wpa_printf(MSG_DEBUG, "wps_status=%d", wps_get_status());
-    if (wps_get_status() == WPS_STATUS_PENDING) {
-        u8 *addr = os_malloc(ETH_ALEN);
-
-        if (!addr) {
-            return false;
-        }
-        os_memcpy(addr, sta->addr, ETH_ALEN);
-        eloop_register_timeout(0, 10000, ap_free_sta_timeout, hapd, addr);
-    } else
-#endif
     ap_free_sta(hapd, sta);
 
     return true;
diff --git a/components/wpa_supplicant/src/eap_server/eap_server_wsc.c b/components/wpa_supplicant/src/eap_server/eap_server_wsc.c
index f3c4756257..653480efcc 100644
--- a/components/wpa_supplicant/src/eap_server/eap_server_wsc.c
+++ b/components/wpa_supplicant/src/eap_server/eap_server_wsc.c
@@ -103,6 +103,13 @@ static void eap_wsc_reset(struct eap_sm *sm, void *priv)
 	wpabuf_free(data->out_buf);
 	//wps_deinit(data->wps);
 	os_free(data);
+#ifdef ESP_SUPPLICANT
+	/* TODO: When wps-registrar is shifted in a separate task other than wifi task,
+	 * call esp_wifi_ap_wps_disable() here instead of wifi_ap_wps_disable_internal()
+	 * */
+	extern int wifi_ap_wps_disable_internal(void);
+	wifi_ap_wps_disable_internal();
+#endif
 }