diff --git a/samples/bluetooth/bap_broadcast_source/prj.conf b/samples/bluetooth/bap_broadcast_source/prj.conf
index 9fd23815bd9..8daf74f8571 100644
--- a/samples/bluetooth/bap_broadcast_source/prj.conf
+++ b/samples/bluetooth/bap_broadcast_source/prj.conf
@@ -3,6 +3,7 @@ CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_BT=y
 CONFIG_LOG=y
 CONFIG_BT_AUDIO=y
+CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_BAP_BROADCAST_SOURCE=y
 
 CONFIG_BT_ISO_MAX_CHAN=2
diff --git a/samples/bluetooth/cap_initiator/Kconfig b/samples/bluetooth/cap_initiator/Kconfig
index 794eab831d5..b9bffa08a2e 100644
--- a/samples/bluetooth/cap_initiator/Kconfig
+++ b/samples/bluetooth/cap_initiator/Kconfig
@@ -24,6 +24,7 @@ config SAMPLE_BROADCAST
 	bool "Whether or not to search for CAP acceptors for broadcast audio"
 	default y if !SAMPLE_UNICAST
 	select BT_BROADCASTER
+	select BT_ISO_BROADCASTER
 	select BT_BAP_BROADCAST_SOURCE
 	select BT_CTLR_ADV_ISO if BT_CTLR
 	help
diff --git a/samples/bluetooth/cap_initiator/prj.conf b/samples/bluetooth/cap_initiator/prj.conf
index 18887a33429..ad5f8117a70 100644
--- a/samples/bluetooth/cap_initiator/prj.conf
+++ b/samples/bluetooth/cap_initiator/prj.conf
@@ -18,6 +18,7 @@ CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT=2
 CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT=2
 CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT=2
 
+CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_BAP_BROADCAST_SOURCE=y
 
 # Broadcast sources values if enabled by CONFIG_SAMPLE_BROADCAST
diff --git a/samples/bluetooth/pbp_public_broadcast_source/prj.conf b/samples/bluetooth/pbp_public_broadcast_source/prj.conf
index 3caa15a383a..004e1832b64 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/prj.conf
+++ b/samples/bluetooth/pbp_public_broadcast_source/prj.conf
@@ -5,6 +5,7 @@ CONFIG_LOG=y
 CONFIG_BT_AUDIO=y
 CONFIG_BT_PERIPHERAL=y
 
+CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_ISO_MAX_CHAN=2
 CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=2
diff --git a/samples/bluetooth/tmap_bms/prj.conf b/samples/bluetooth/tmap_bms/prj.conf
index be8acce1880..62219183f30 100644
--- a/samples/bluetooth/tmap_bms/prj.conf
+++ b/samples/bluetooth/tmap_bms/prj.conf
@@ -16,6 +16,7 @@ CONFIG_BT_TMAP=y
 CONFIG_BT_CAP_INITIATOR=y
 
 # BAP support
+CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_BAP_BROADCAST_SOURCE=y
 CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=1
 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=1
diff --git a/subsys/bluetooth/audio/Kconfig.bap b/subsys/bluetooth/audio/Kconfig.bap
index ba66f39bc89..9c565693e3a 100644
--- a/subsys/bluetooth/audio/Kconfig.bap
+++ b/subsys/bluetooth/audio/Kconfig.bap
@@ -120,7 +120,7 @@ endif # BT_BAP_UNICAST_CLIENT
 
 config BT_BAP_BROADCAST_SOURCE
 	bool "Bluetooth Broadcast Source Audio Support"
-	select BT_ISO_BROADCASTER
+	depends on BT_ISO_BROADCASTER
 	help
 	  This option enables support for Bluetooth Broadcast Source Audio using
 	  Isochronous channels.
diff --git a/tests/bluetooth/audio/bap_broadcast_source/prj.conf b/tests/bluetooth/audio/bap_broadcast_source/prj.conf
index 4f4534ac2a5..5bbdaecce6b 100644
--- a/tests/bluetooth/audio/bap_broadcast_source/prj.conf
+++ b/tests/bluetooth/audio/bap_broadcast_source/prj.conf
@@ -3,6 +3,7 @@ CONFIG_ZTEST=y
 CONFIG_BT=y
 CONFIG_BT_AUDIO=y
 
+CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_ISO_MAX_CHAN=2
 
 CONFIG_BT_BAP_BROADCAST_SOURCE=y
diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf
index a509fd8f83c..f142e170280 100644
--- a/tests/bluetooth/shell/audio.conf
+++ b/tests/bluetooth/shell/audio.conf
@@ -55,6 +55,7 @@ CONFIG_BT_PER_ADV_SYNC_TRANSFER_RECEIVER=y
 CONFIG_BT_PER_ADV_SYNC_TRANSFER_SENDER=y
 
 # Support an ISO channel per ASE
+CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_ISO_MAX_CHAN=4
 CONFIG_BT_ISO_TEST_PARAMS=y
diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf
index 3f1b5878bf3..97f6a2b2bab 100644
--- a/tests/bluetooth/tester/overlay-le-audio.conf
+++ b/tests/bluetooth/tester/overlay-le-audio.conf
@@ -8,6 +8,7 @@ CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
 CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_ISO_CENTRAL=y
+CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_EXT_ADV=y
 CONFIG_BT_BAP_UNICAST_SERVER=y
 CONFIG_BT_BAP_UNICAST_CLIENT=y
diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf
index 70b0e8d465b..c9b786e94f5 100644
--- a/tests/bsim/bluetooth/audio/prj.conf
+++ b/tests/bsim/bluetooth/audio/prj.conf
@@ -5,6 +5,7 @@ CONFIG_NO_OPTIMIZATIONS=y
 CONFIG_BT=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_ISO_CENTRAL=y
+CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_DEVICE_NAME="bsim_test_audio"
 # TBS Client may require up to 12 buffers