diff --git a/samples/cellular/nrf_cloud_ble_gateway/Kconfig b/samples/cellular/nrf_cloud_ble_gateway/Kconfig
index 80d8f1b94544..f6a29c087df0 100644
--- a/samples/cellular/nrf_cloud_ble_gateway/Kconfig
+++ b/samples/cellular/nrf_cloud_ble_gateway/Kconfig
@@ -10,6 +10,13 @@ config APP_VERSION
 	string "nRF Cloud BLE Gateway Sample version"
 	default "1.0.0"
 
+config USE_BT_HCI_SETUP
+	bool "Use BT HCI setup"
+	default y
+	select BT_HCI_SETUP
+	help
+	  Get the setup to run.
+
 config CLOUD_CONNECTION_RETRY_TIMEOUT_SECONDS
 	int "Cloud connection retry timeout (seconds)"
 	default 30
diff --git a/subsys/bluetooth/controller/hci_internal.c b/subsys/bluetooth/controller/hci_internal.c
index 1726680163ff..453227164fa0 100644
--- a/subsys/bluetooth/controller/hci_internal.c
+++ b/subsys/bluetooth/controller/hci_internal.c
@@ -145,7 +145,7 @@ static bool check_and_handle_is_host_using_legacy_and_extended_commands(uint8_t
 	switch (opcode) {
 #if defined(CONFIG_BT_BROADCASTER)
 	case SDC_HCI_OPCODE_CMD_LE_SET_EXT_ADV_PARAMS:
-	case SDC_HCI_OPCODE_CMD_LE_SET_EXT_ADV_PARAMS_V2:
+	//case SDC_HCI_OPCODE_CMD_LE_SET_EXT_ADV_PARAMS_V2:
 	case SDC_HCI_OPCODE_CMD_LE_READ_NUMBER_OF_SUPPORTED_ADV_SETS:
 #endif /* CONFIG_BT_BROADCASTER */
 #if defined(CONFIG_BT_PER_ADV_SYNC)