diff --git a/client/device.c b/client/device.c
index 52e820ea..0bf528d9 100644
--- a/client/device.c
+++ b/client/device.c
@@ -533,21 +533,6 @@ static enum cmd_status cmd_scan(const char *device_name,
 	return CMD_STATUS_TRIGGERED;
 }
 
-static enum cmd_status cmd_disconnect(const char *device_name,
-						char **argv, int argc)
-{
-	const struct proxy_interface *proxy =
-					device_proxy_find_by_name(device_name);
-
-	if (!proxy)
-		return CMD_STATUS_INVALID_ARGS;
-
-	proxy_interface_method_call(proxy, "Disconnect", "",
-						check_errors_method_callback);
-
-	return CMD_STATUS_TRIGGERED;
-}
-
 static enum cmd_status cmd_get_networks(const char *device_name,
 						char **argv, int argc)
 {
@@ -724,8 +709,6 @@ static const struct command device_commands[] = {
 					cmd_connect_hidden_network,
 						"Connect to hidden network",
 									false },
-	{ "<wlan>", "disconnect",
-				NULL,   cmd_disconnect, "Disconnect" },
 	{ }
 };
 
diff --git a/client/station.c b/client/station.c
index af0d43f2..a35050b6 100644
--- a/client/station.c
+++ b/client/station.c
@@ -129,6 +129,12 @@ static struct proxy_interface_type station_interface_type = {
 	.ops = &station_ops,
 };
 
+static void check_errors_method_callback(struct l_dbus_message *message,
+								void *user_data)
+{
+	dbus_message_has_error(message);
+}
+
 static void display_station_inline(const char *margin, const void *data)
 {
 	const struct proxy_interface *station_i = data;
@@ -179,8 +185,27 @@ static enum cmd_status cmd_list(const char *device_name, char **argv, int argc)
 	return CMD_STATUS_DONE;
 }
 
+static enum cmd_status cmd_disconnect(const char *device_name,
+						char **argv, int argc)
+{
+	const struct proxy_interface *station_i =
+			device_proxy_find(device_name, IWD_STATION_INTERFACE);
+
+	if (!station_i) {
+		display("No station on device: '%s'\n", device_name);
+		return CMD_STATUS_INVALID_VALUE;
+	}
+
+	proxy_interface_method_call(station_i, "Disconnect", "",
+						check_errors_method_callback);
+
+	return CMD_STATUS_TRIGGERED;
+}
+
 static const struct command station_commands[] = {
 	{ NULL, "list", NULL, cmd_list, "List Ad-Hoc devices", true },
+	{ "<wlan>", "disconnect",
+				NULL,   cmd_disconnect, "Disconnect" },
 	{ }
 };