diff --git a/client/main.c b/client/main.c
index b8eb707..ddfe511 100644
--- a/client/main.c
+++ b/client/main.c
@@ -428,8 +428,14 @@ static void cmd_select(const char *arg)
 		return;
 	}
 
+	if (default_ctrl == proxy)
+		return;
+
 	default_ctrl = proxy;
 	print_adapter(proxy, NULL);
+
+	g_list_free(dev_list);
+	dev_list = NULL;
 }
 
 static void cmd_devices(const char *arg)