diff --git a/client/main.c b/client/main.c
index 5d32b52..ce753c1 100644
--- a/client/main.c
+++ b/client/main.c
@@ -3426,7 +3426,6 @@ int main(int argc, char *argv[])
 		bt_shell_set_env("AUTO_REGISTER_ENDPOINT",
 					(void *)endpoint_option);
 
-	player_enable_submenu();
 	mgmt_enable_submenu();
 	assistant_enable_submenu();
 
diff --git a/client/player.c b/client/player.c
index 7aab4af..0314cd3 100644
--- a/client/player.c
+++ b/client/player.c
@@ -154,6 +154,7 @@ struct transport_select_args {
 	struct queue *selecting;
 };
 
+static void player_menu_pre_run(const struct bt_shell_menu *menu);
 static void transport_set_links(struct transport_select_args *args);
 static void transport_select(struct transport_select_args *args);
 
@@ -5838,6 +5839,7 @@ static void cmd_volume_transport(int argc, char *argv[])
 static const struct bt_shell_menu transport_menu = {
 	.name = "transport",
 	.desc = "Media Transport Submenu",
+	.pre_run = player_menu_pre_run,
 	.entries = {
 	{ "list",         NULL,    cmd_list_transport,
 						"List available transports" },
@@ -5878,7 +5880,7 @@ void player_add_submenu(void)
 	bt_shell_add_submenu(&transport_menu);
 }
 
-void player_enable_submenu(void)
+static void player_menu_pre_run(const struct bt_shell_menu *menu)
 {
 	dbus_conn = bt_shell_get_env("DBUS_CONNECTION");
 	if (!dbus_conn || client)
diff --git a/client/player.h b/client/player.h
index c09ffa9..e7778cb 100644
--- a/client/player.h
+++ b/client/player.h
@@ -9,5 +9,4 @@
  */
 
 void player_add_submenu(void);
-void player_enable_submenu(void);
 void player_remove_submenu(void);