diff --git a/components/bt/controller/esp32c3/Kconfig.in b/components/bt/controller/esp32c3/Kconfig.in
index 3de19d0504..65db719eb5 100644
--- a/components/bt/controller/esp32c3/Kconfig.in
+++ b/components/bt/controller/esp32c3/Kconfig.in
@@ -545,7 +545,7 @@ config BT_CTRL_BLE_SCAN
     default y
 
 config BT_CTRL_BLE_SECURITY_ENABLE
-    depends on BT_CTRL_RUN_IN_FLASH_ONLY && BT_CONTROLLER_ONLY
+    depends on BT_CTRL_RUN_IN_FLASH_ONLY
     bool "Enable BLE security feature"
     default y
 
diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt
index ca5994b540..f2b61fe00e 100644
--- a/components/esp_rom/CMakeLists.txt
+++ b/components/esp_rom/CMakeLists.txt
@@ -200,17 +200,19 @@ else() # Regular app build
         endif()
 
     elseif(target STREQUAL "esp32c3")
-        if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY)
+        if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY AND NOT CONFIG_BT_CTRL_HCI_MODE_UART_H4)
             if(NOT CONFIG_BT_CTRL_BLE_MASTER)
                 rom_linker_script("ble_master")
             endif()
-            if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
-                rom_linker_script("ble_50")
+            if(NOT CONFIG_BT_CONTROLLER_ONLY)
+                if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
+                    rom_linker_script("ble_50")
+                endif()
             endif()
             if(CONFIG_BT_BLE_CCA_MODE_NONE)
                 rom_linker_script("ble_cca")
             endif()
-            if(NOT CONFIG_BT_NIMBLE_SECURITY_ENABLE AND NOT CONFIG_BT_BLE_SMP_ENABLE)
+            if(NOT CONFIG_BT_CTRL_BLE_SECURITY_ENABLE)
                 rom_linker_script("ble_smp")
             endif()
             if(NOT CONFIG_BT_CTRL_DTM_ENABLE)
@@ -238,17 +240,19 @@ else() # Regular app build
             endif()
         endif()
     elseif(target STREQUAL "esp32s3")
-        if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY)
+        if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY AND NOT CONFIG_BT_CTRL_HCI_MODE_UART_H4)
             if(NOT CONFIG_BT_CTRL_BLE_MASTER)
                 rom_linker_script("ble_master")
             endif()
-            if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
-                rom_linker_script("ble_50")
+            if(NOT CONFIG_BT_CONTROLLER_ONLY)
+                if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
+                    rom_linker_script("ble_50")
+                endif()
             endif()
             if(CONFIG_BT_BLE_CCA_MODE_NONE)
                 rom_linker_script("ble_cca")
             endif()
-            if(NOT CONFIG_BT_NIMBLE_SECURITY_ENABLE AND NOT CONFIG_BT_BLE_SMP_ENABLE)
+            if(NOT CONFIG_BT_CTRL_BLE_SECURITY_ENABLE)
                 rom_linker_script("ble_smp")
             endif()
             if(NOT CONFIG_BT_CTRL_DTM_ENABLE)