diff --git a/components/esp_hw_support/Kconfig b/components/esp_hw_support/Kconfig
index 658b671ef8..f6769fd8d0 100644
--- a/components/esp_hw_support/Kconfig
+++ b/components/esp_hw_support/Kconfig
@@ -226,9 +226,6 @@ menu "Hardware Settings"
 
         config ESP_SLEEP_SET_FLASH_DPD
             bool "Set SPI flash to deep power-down mode in light sleep"
-            select PM_SLP_IRAM_OPT
-            select ESP_PERIPH_CTRL_FUNC_IN_IRAM
-            select ESP_REGI2C_CTRL_FUNC_IN_IRAM
             depends on (!APP_BUILD_TYPE_PURE_RAM_APP && !ESP_SLEEP_POWER_DOWN_FLASH && !SPI_FLASH_ROM_IMPL)
             default y if (IDF_TARGET_ESP32H4 || IDF_TARGET_ESP32H21)
             default y if (IDF_TARGET_ESP32P4 && ESP32P4_SELECTS_REV_LESS_V3)
diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c
index 92890b9b8d..5455908037 100644
--- a/components/esp_hw_support/sleep_modes.c
+++ b/components/esp_hw_support/sleep_modes.c
@@ -994,6 +994,12 @@ static esp_err_t FORCE_IRAM_ATTR esp_sleep_start_safe(uint32_t sleep_flags, uint
 #endif
 #endif // !SOC_MSPI_HAS_INDEPENT_IOMUX
         }
+#endif
+#if CONFIG_ESP_SLEEP_SET_FLASH_DPD
+        if (sleep_flags & RTC_SLEEP_FLASH_DPD) {
+            //Release Flash out from deep powerdown mode
+            spi_flash_enable_deep_power_down_mode(false);
+        }
 #endif
         /* Cache Resume 1: Resume cache for continue running*/
         resume_cache();
@@ -1406,12 +1412,6 @@ static SLEEP_FN_ATTR esp_err_t esp_light_sleep_inner(uint32_t sleep_flags, uint3
         // Wait for the flash chip to start up
         esp_rom_delay_us(flash_enable_time_us);
     } else {
-#if CONFIG_ESP_SLEEP_SET_FLASH_DPD
-        if (sleep_flags & RTC_SLEEP_FLASH_DPD) {
-            //Release Flash out from deep powerdown mode
-            spi_flash_enable_deep_power_down_mode(false);
-        }
-#endif
     }
 
 #if CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION