diff --git a/components/esp_hw_support/include/esp_private/esp_modem_clock.h b/components/esp_hw_support/include/esp_private/esp_modem_clock.h
index 63ff5b4afb6..16fbfcaf3be 100644
--- a/components/esp_hw_support/include/esp_private/esp_modem_clock.h
+++ b/components/esp_hw_support/include/esp_private/esp_modem_clock.h
@@ -74,6 +74,15 @@ void modem_clock_module_disable(periph_module_t module);
  */
 uint32_t modem_clock_module_bits_get(periph_module_t module);
 
+#if SOC_WIFI_SUPPORTED
+/**
+ * @brief Set Wi-Fi initialization status.
+ *
+ * @param inited Wi-Fi initialization status.
+ */
+void modem_clock_configure_wifi_status(bool inited);
+#endif
+
 /**
  * @brief Reset the mac of modem module
  *
diff --git a/components/esp_hw_support/modem_clock.c b/components/esp_hw_support/modem_clock.c
index cdf47d4e6e4..61eb815ff62 100644
--- a/components/esp_hw_support/modem_clock.c
+++ b/components/esp_hw_support/modem_clock.c
@@ -45,6 +45,8 @@ typedef enum {
     MODEM_CLOCK_DEVICE_MAX
 } modem_clock_device_t;
 
+#define MODEM_STATUS_IDLE           (0)
+#define MODEM_STATUS_WIFI_INITED    (0x1UL)
 
 typedef struct modem_clock_context {
     modem_clock_hal_context_t *hal;
@@ -56,13 +58,16 @@ typedef struct modem_clock_context {
     } dev[MODEM_CLOCK_DEVICE_MAX];
     /* the low-power clock source for each module */
     modem_clock_lpclk_src_t lpclk_src[PERIPH_MODEM_MODULE_NUM];
+#if SOC_WIFI_SUPPORTED
+    uint32_t modem_status;
+#endif
 } modem_clock_context_t;
 
 
 #if SOC_WIFI_SUPPORTED
 static void IRAM_ATTR modem_clock_wifi_mac_configure(modem_clock_context_t *ctx, bool enable)
 {
-    if (enable) {
+    if (enable || !(ctx->modem_status & MODEM_STATUS_WIFI_INITED)) {
         modem_syscon_ll_enable_wifi_apb_clock(ctx->hal->syscon_dev, enable);
         modem_syscon_ll_enable_wifi_mac_clock(ctx->hal->syscon_dev, enable);
     }
@@ -70,7 +75,7 @@ static void IRAM_ATTR modem_clock_wifi_mac_configure(modem_clock_context_t *ctx,
 
 static void IRAM_ATTR modem_clock_wifi_bb_configure(modem_clock_context_t *ctx, bool enable)
 {
-    if (enable) {
+    if (enable || !(ctx->modem_status & MODEM_STATUS_WIFI_INITED)) {
         modem_syscon_ll_clk_wifibb_configure(ctx->hal->syscon_dev, enable);
     }
 }
@@ -156,6 +161,10 @@ modem_clock_context_t * __attribute__((weak)) IRAM_ATTR MODEM_CLOCK_instance(voi
             [MODEM_CLOCK_DATADUMP]              = { .refs = 0, .configure = modem_clock_data_dump_configure }
         },
         .lpclk_src = { [0 ... PERIPH_MODEM_MODULE_NUM - 1] = MODEM_CLOCK_LPCLK_SRC_INVALID }
+#if SOC_WIFI_SUPPORTED
+        ,
+        .modem_status = MODEM_STATUS_IDLE
+#endif
     };
     return &modem_clock_context;
 }
@@ -372,6 +381,18 @@ uint32_t IRAM_ATTR modem_clock_module_bits_get(periph_module_t module)
     return val;
 }
 
+#if SOC_WIFI_SUPPORTED
+void modem_clock_configure_wifi_status(bool inited)
+{
+    portENTER_CRITICAL_SAFE(&MODEM_CLOCK_instance()->lock);
+    if (inited)
+        MODEM_CLOCK_instance()->modem_status |= MODEM_STATUS_WIFI_INITED;
+    else
+        MODEM_CLOCK_instance()->modem_status &= ~MODEM_STATUS_WIFI_INITED;
+    portEXIT_CRITICAL_SAFE(&MODEM_CLOCK_instance()->lock);
+}
+#endif
+
 void modem_clock_deselect_all_module_lp_clock_source(void)
 {
 #if SOC_WIFI_SUPPORTED
diff --git a/components/esp_wifi/src/wifi_init.c b/components/esp_wifi/src/wifi_init.c
index d3903a4c854..d6535c5c1d3 100644
--- a/components/esp_wifi/src/wifi_init.c
+++ b/components/esp_wifi/src/wifi_init.c
@@ -34,6 +34,10 @@
 #include "esp_private/sleep_retention.h"
 #endif
 
+#if SOC_MODEM_CLOCK_IS_INDEPENDENT
+#include "esp_private/esp_modem_clock.h"
+#endif
+
 static bool s_wifi_inited = false;
 
 #if (CONFIG_ESP_WIFI_RX_BA_WIN > CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM)
@@ -221,6 +225,10 @@ static esp_err_t wifi_deinit_internal(void)
 
     s_wifi_inited = false;
 
+#if SOC_MODEM_CLOCK_IS_INDEPENDENT
+    modem_clock_configure_wifi_status(s_wifi_inited);
+#endif
+
     return err;
 }
 
@@ -440,6 +448,10 @@ esp_err_t esp_wifi_init(const wifi_init_config_t *config)
 
     s_wifi_inited = true;
 
+#if SOC_MODEM_CLOCK_IS_INDEPENDENT
+    modem_clock_configure_wifi_status(s_wifi_inited);
+#endif
+
     return result;
 
 _deinit: