diff --git a/components/esp_pm/test_apps/esp_pm/sdkconfig.ci.limits b/components/esp_pm/test_apps/esp_pm/sdkconfig.ci.limits
index 2aec98155c..b0266392d9 100644
--- a/components/esp_pm/test_apps/esp_pm/sdkconfig.ci.limits
+++ b/components/esp_pm/test_apps/esp_pm/sdkconfig.ci.limits
@@ -3,8 +3,6 @@
 # Limit test esp_pm auto light sleep logic with faster ticks and faster code
 CONFIG_FREERTOS_HZ=1000
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
-# Minimize the automatic light sleep entry threshold
-CONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP=2
 
 # Enable PM options for automatic sleeping and DFS
 CONFIG_PM_DFS_INIT_AUTO=y
diff --git a/components/freertos/Kconfig b/components/freertos/Kconfig
index df75e9c63e..aaa7369195 100644
--- a/components/freertos/Kconfig
+++ b/components/freertos/Kconfig
@@ -337,6 +337,7 @@ menu "FreeRTOS"
             # Todo: Rename to CONFIG_FREERTOS_EXPECTED_IDLE_TIME_BEFORE_SLEEP (IDF-4986)
             int "configEXPECTED_IDLE_TIME_BEFORE_SLEEP"
             depends on FREERTOS_USE_TICKLESS_IDLE
+            default 8 if !PM_SLP_IRAM_OPT && (FREERTOS_HZ > 200)
             default 3
             range 2 4294967295
             # Minimal value is 2 because of a check in FreeRTOS.h (search configEXPECTED_IDLE_TIME_BEFORE_SLEEP)