diff --git a/components/esp_event/event_send.c b/components/esp_event/event_send.c
index 80fe464a81..79a450860e 100644
--- a/components/esp_event/event_send.c
+++ b/components/esp_event/event_send.c
@@ -82,6 +82,9 @@ static system_event_id_t esp_event_legacy_wifi_event_id(int32_t event_id)
     case WIFI_EVENT_AP_PROBEREQRECVED:
         return SYSTEM_EVENT_AP_PROBEREQRECVED;
 
+    case WIFI_EVENT_STA_BEACON_TIMEOUT:
+        return SYSTEM_EVENT_STA_BEACON_TIMEOUT;
+
     default:
         ESP_LOGE(TAG, "invalid wifi event id %d", event_id);
         return SYSTEM_EVENT_MAX;
diff --git a/components/esp_event/include/esp_event_legacy.h b/components/esp_event/include/esp_event_legacy.h
index ba74ec776c..92957a82e1 100644
--- a/components/esp_event/include/esp_event_legacy.h
+++ b/components/esp_event/include/esp_event_legacy.h
@@ -47,6 +47,7 @@ typedef enum {
     SYSTEM_EVENT_AP_STADISCONNECTED,       /*!< a station disconnected from ESP32 soft-AP */
     SYSTEM_EVENT_AP_STAIPASSIGNED,         /*!< ESP32 soft-AP assign an IP to a connected station */
     SYSTEM_EVENT_AP_PROBEREQRECVED,        /*!< Receive probe request packet in soft-AP interface */
+    SYSTEM_EVENT_STA_BEACON_TIMEOUT,       /*!< ESP32 station beacon timeout */
     SYSTEM_EVENT_GOT_IP6,                  /*!< ESP32 station or ap or ethernet interface v6IP addr is preferred */
     SYSTEM_EVENT_ETH_START,                /*!< ESP32 ethernet start */
     SYSTEM_EVENT_ETH_STOP,                 /*!< ESP32 ethernet stop */
diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h
index ae92443593..244f6089be 100644
--- a/components/esp_wifi/include/esp_wifi_types.h
+++ b/components/esp_wifi/include/esp_wifi_types.h
@@ -519,6 +519,7 @@ typedef enum {
     WIFI_EVENT_STA_CONNECTED,            /**< ESP32 station connected to AP */
     WIFI_EVENT_STA_DISCONNECTED,         /**< ESP32 station disconnected from AP */
     WIFI_EVENT_STA_AUTHMODE_CHANGE,      /**< the auth mode of AP connected by ESP32 station changed */
+    WIFI_EVENT_STA_BEACON_TIMEOUT,       /**< ESP32 station beacon timeout */
 
     WIFI_EVENT_STA_WPS_ER_SUCCESS,       /**< ESP32 station wps succeeds in enrollee mode */
     WIFI_EVENT_STA_WPS_ER_FAILED,        /**< ESP32 station wps fails in enrollee mode */
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index fbcdc77c26..ebad769a24 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit fbcdc77c26eb0d716927c8bc7d73dbec9a8987c1
+Subproject commit ebad769a24418ac1fc3c5d585b1dddecee7852f7
diff --git a/components/wpa_supplicant/src/wps/wps_registrar.c b/components/wpa_supplicant/src/wps/wps_registrar.c
index 2a13b3bbb3..3d22a5eb5c 100644
--- a/components/wpa_supplicant/src/wps/wps_registrar.c
+++ b/components/wpa_supplicant/src/wps/wps_registrar.c
@@ -101,8 +101,8 @@ static void wps_remove_pin(struct wps_uuid_pin *pin)
 static void wps_free_pins(struct dl_list *pins)
 {
 	struct wps_uuid_pin *pin, *prev;
-	dl_list_for_each_safe(pin, prev, pins, struct wps_uuid_pin, list);
-	wps_remove_pin(pin);
+	dl_list_for_each_safe(pin, prev, pins, struct wps_uuid_pin, list)
+		wps_remove_pin(pin);
 }
 
 #endif