diff --git a/components/esptool_py/Kconfig.projbuild b/components/esptool_py/Kconfig.projbuild
index ff7c13e99a..2bb777e3d5 100644
--- a/components/esptool_py/Kconfig.projbuild
+++ b/components/esptool_py/Kconfig.projbuild
@@ -11,12 +11,12 @@ menu "Serial flasher config"
             like compressed downloads and more. Usually you should not need to disable that feature
 
     config ESPTOOLPY_OCT_FLASH
-        depends on IDF_TARGET_ESP32S3
+        depends on SOC_SPI_MEM_SUPPORT_FLASH_OPI_MODE
         bool "Enable Octal Flash"
         default n
 
     config ESPTOOLPY_FLASH_MODE_AUTO_DETECT
-        depends on IDF_TARGET_ESP32S3
+        depends on SOC_SPI_MEM_SUPPORT_FLASH_OPI_MODE
         bool "Choose flash mode automatically (please read help)"
         default y
         help
diff --git a/components/spi_flash/Kconfig b/components/spi_flash/Kconfig
index 50b9a0beb6..5a3bcefa75 100644
--- a/components/spi_flash/Kconfig
+++ b/components/spi_flash/Kconfig
@@ -240,7 +240,8 @@ menu "SPI Flash driver"
 
     config SPI_FLASH_ROM_IMPL
         bool "Use esp_flash implementation in ROM"
-        depends on ESP_ROM_HAS_SPI_FLASH
+        depends on ESP_ROM_HAS_SPI_FLASH && !ESPTOOLPY_OCT_FLASH
+        # ROM never supports octal flash before. Future if ROM supports it we can use a ESP_ROM_x macro
         default n
         help
             Enable this flag to use new SPI flash driver functions from ROM instead of ESP-IDF.