diff --git a/Kconfig b/Kconfig
index 2987412361..0fcb5e1e5e 100644
--- a/Kconfig
+++ b/Kconfig
@@ -38,6 +38,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
         bool
         default "y" if IDF_TARGET="esp32s2beta"
         default "n"
+        select FREERTOS_UNICORE
 
     menu "SDK tool configuration"
         config SDK_TOOLPREFIX
diff --git a/components/freertos/Kconfig b/components/freertos/Kconfig
index 06461b9198..c6a4d36b31 100644
--- a/components/freertos/Kconfig
+++ b/components/freertos/Kconfig
@@ -1,12 +1,5 @@
 menu "FreeRTOS"
 
-    config FREERTOS_SINGLE_CORE_ONLY
-        # invisible config item to always select FREERTOS_UNICORE on single core IDF_TARGET
-        bool
-        default y
-        depends on IDF_TARGET_ESP32S2BETA
-        select FREERTOS_UNICORE
-
     config FREERTOS_UNICORE
         # This config variable is also checked in the ESP32 startup code, not only in FreeRTOS.
         bool "Run FreeRTOS only on first core"