diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index cf0c7bad626..7200784deba 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -29,15 +29,6 @@ config BT_NRF51_PM
 	  Power Management support for Nordic BLE nRF51 chip. Allows to enable,
 	  disable the chip and handle wakeups.
 
-config BT_WAIT_NOP
-	bool "Wait for \"NOP\" Command Complete event during init"
-	depends on BT_HCI
-	help
-	  Some controllers emit a Command Complete event for the NOP
-	  opcode to indicate that they're ready to receive commands.
-	  This option should be selected if the controller used
-	  exhibits such behavior.
-
 endmenu
 
 endif # BT
diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index cdb64823b13..f08f0dca0b8 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -62,6 +62,15 @@ config BT_HCI_TX_PRIO
 	int
 	default 7
 
+config BT_WAIT_NOP
+	bool "Wait for \"NOP\" Command Complete event during init"
+	depends on BT_HCI
+	help
+	  Some controllers emit a Command Complete event for the NOP
+	  opcode to indicate that they're ready to receive commands.
+	  This option should be selected if the controller used
+	  exhibits such behavior.
+
 # Headroom that the driver needs for sending and receiving buffers.
 # Add a new 'default' entry for each new driver.
 config BT_HCI_RESERVE