diff --git a/client/player.c b/client/player.c
index 13744ba..647e9be 100644
--- a/client/player.c
+++ b/client/player.c
@@ -3776,6 +3776,30 @@ static void config_endpoint_sync_factor(const char *input, void *user_data)
 	}
 }
 
+static void config_endpoint_iso_stream(const char *input, void *user_data)
+{
+	struct endpoint_config *cfg = user_data;
+	char *endptr = NULL;
+	int value;
+
+	if (!strcasecmp(input, "a") || !strcasecmp(input, "auto")) {
+		cfg->ep->iso_stream = BT_ISO_QOS_STREAM_UNSET;
+	} else {
+		value = strtol(input, &endptr, 0);
+
+		if (!endptr || *endptr != '\0' || value > UINT8_MAX) {
+			bt_shell_printf("Invalid argument: %s\n", input);
+			return bt_shell_noninteractive_quit(EXIT_FAILURE);
+		}
+
+		cfg->ep->iso_stream = value;
+	}
+
+	bt_shell_prompt_input(cfg->ep->path,
+			"Enter sync factor (value/auto):",
+			config_endpoint_sync_factor, cfg);
+}
+
 static void config_endpoint_iso_group(const char *input, void *user_data)
 {
 	struct endpoint_config *cfg = user_data;
@@ -3796,8 +3820,8 @@ static void config_endpoint_iso_group(const char *input, void *user_data)
 	}
 
 	bt_shell_prompt_input(cfg->ep->path,
-			"Enter sync factor (value/auto):",
-			config_endpoint_sync_factor, cfg);
+		"BIS (auto/value):",
+		config_endpoint_iso_stream, cfg);
 }
 
 static void endpoint_set_config_bcast(struct endpoint_config *cfg)
diff --git a/client/scripts/broadcast-source.bt b/client/scripts/broadcast-source.bt
index 1b918ef..850fba0 100644
--- a/client/scripts/broadcast-source.bt
+++ b/client/scripts/broadcast-source.bt
@@ -6,7 +6,8 @@ a
 4
 endpoint.config /org/bluez/hci0/pac_bcast0 /local/endpoint/ep0 16_2_1
 1
+1
 a
 3
 0x03 0x02 0x04 0x00
-transport.acquire /org/bluez/hci0/pac_bcast0/fd0
\ No newline at end of file
+transport.acquire /org/bluez/hci0/pac_bcast0/fd0