diff --git a/client/assistant.c b/client/assistant.c
index 555ac6f..19d9faa 100644
--- a/client/assistant.c
+++ b/client/assistant.c
@@ -55,6 +55,8 @@ static DBusConnection *dbus_conn;
 
 static GList *assistants;
 
+static void assistant_menu_pre_run(const struct bt_shell_menu *menu);
+
 static char *proxy_description(GDBusProxy *proxy, const char *title,
 						const char *description)
 {
@@ -384,6 +386,7 @@ fail:
 static const struct bt_shell_menu assistant_menu = {
 	.name = "assistant",
 	.desc = "Media Assistant Submenu",
+	.pre_run = assistant_menu_pre_run,
 	.entries = {
 	{ "push", "<assistant>", cmd_push_assistant,
 					"Send stream information to peer" },
@@ -397,7 +400,7 @@ void assistant_add_submenu(void)
 	bt_shell_add_submenu(&assistant_menu);
 }
 
-void assistant_enable_submenu(void)
+static void assistant_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/assistant.h b/client/assistant.h
index c304abe..418b0b8 100644
--- a/client/assistant.h
+++ b/client/assistant.h
@@ -9,6 +9,5 @@
  */
 
 void assistant_add_submenu(void);
-void assistant_enable_submenu(void);
 void assistant_remove_submenu(void);
 
diff --git a/client/main.c b/client/main.c
index 06ae25c..36a7446 100644
--- a/client/main.c
+++ b/client/main.c
@@ -3426,8 +3426,6 @@ int main(int argc, char *argv[])
 		bt_shell_set_env("AUTO_REGISTER_ENDPOINT",
 					(void *)endpoint_option);
 
-	assistant_enable_submenu();
-
 	client = g_dbus_client_new(dbus_conn, "org.bluez", "/org/bluez");
 
 	g_dbus_client_set_connect_watch(client, connect_handler, NULL);