diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c
index f3410fc561..95e71005ea 100644
--- a/components/esp_phy/src/phy_init.c
+++ b/components/esp_phy/src/phy_init.c
@@ -301,6 +301,8 @@ void esp_phy_disable(esp_phy_modem_t modem)
         phy_digital_regs_store();
 #endif
 #if SOC_PM_SUPPORT_PMU_MODEM_STATE && CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP
+        extern void pm_mac_modem_clear_rf_power_state(void);
+        pm_mac_modem_clear_rf_power_state();
         if (sleep_modem_wifi_modem_state_enabled()) {
             sleep_modem_wifi_do_phy_retention(false);
         } else
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 99f2732239..cf8d44d37c 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 99f27322398810dec4bdacca5d1d47aee85fb368
+Subproject commit cf8d44d37c1bb9ffb37d855a05b069bddfb6a551