diff --git a/src/director/doveadm-connection.c b/src/director/doveadm-connection.c
index 68071d5941..c1fff1f7ec 100644
--- a/src/director/doveadm-connection.c
+++ b/src/director/doveadm-connection.c
@@ -662,8 +662,10 @@ doveadm_cmd_user_move(struct doveadm_connection *conn, const char *const *args)
 		return 1;
 	}
 
-	director_move_user(conn->dir, conn->dir->self_host, NULL,
-			   username_hash, host);
+	if (user == NULL || user->host != host) {
+		director_move_user(conn->dir, conn->dir->self_host, NULL,
+				   username_hash, host);
+	}
 	o_stream_nsend(conn->output, "OK\n", 3);
 	return 1;
 }