diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index a4af2e80e7505..baa95be15946d 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -895,6 +895,7 @@ config ESP32_IRAM_HEAP
 	bool "Use the rest of IRAM as a separate heap"
 	select ARCH_HAVE_EXTRA_HEAPS
 	select LIBC_ARCH_ATOMIC
+	select ARCH_USE_TEXT_HEAP
 	default n
 
 endmenu # Memory Configuration
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/nvblk/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/nvblk/defconfig
index bcce19b139d36..5e2e8aaf5b325 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/nvblk/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/nvblk/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_IRQ_TO_NDX=y
 CONFIG_ARCH_MINIMAL_VECTORTABLE_DYNAMIC=y
 CONFIG_ARCH_NUSER_INTERRUPTS=2
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_USE_TEXT_HEAP=y
 CONFIG_ARCH_XTENSA=y
 CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=16717