diff --git a/src/base/commands.c b/src/base/commands.c
index 5fc5b0ac8eedd10e6ee2078d0400252c00fc4d60..4d742a503b917c7e572f82d34a1ca1a10e5f8146 100644
--- a/src/base/commands.c
+++ b/src/base/commands.c
@@ -245,7 +245,7 @@ command_playid(struct lkt_state *srv, char *args[LKT_MESSAGE_ARGS_MAX])
 bool
 command_stop(struct lkt_state *srv, char __attribute__((unused))  *args[LKT_MESSAGE_ARGS_MAX])
 {
-    RETURN_UNLESS(database_queue_stop(srv->db), "DB error", false);
+    RETURN_UNLESS(database_queue_stop(srv->db), "DB error on stop", false);
     MOD_PROC(srv->window_mod, "close");
     srv->mpd_idle_events |= MPD_IDLE_PLAYER;
     return true;
@@ -283,7 +283,8 @@ inline bool
 command_clear(struct lkt_state *srv, char __attribute__((unused)) *args[LKT_MESSAGE_ARGS_MAX])
 {
     srv->mpd_idle_events |= MPD_IDLE_PLAYER;
-    return database_queue_clear(srv->db);
+    return command_stop(srv, args) &&
+           database_queue_clear(srv->db);
 }
 
 inline bool
diff --git a/src/database/queue.c b/src/database/queue.c
index 1573e56557e7023618ed3cfdbfc0129cfef5966b..ac5d1181731da4fc42923e8e85aceec6648b0c7d 100644
--- a/src/database/queue.c
+++ b/src/database/queue.c
@@ -19,11 +19,18 @@
         SQLITE_DO_ROLLBACK(db);                                         \
         return false;                                                   \
     }
-sqlite_just_exec(database_queue_toggle_pause, "UPDATE queue_state SET paused = 1 - paused;")
-sqlite_just_exec(database_queue_crop, "DELETE FROM queue WHERE queue.kara_id <> (SELECT current FROM queue_state LIMIT 1);")
-sqlite_just_exec(database_queue_stop, "UPDATE queue_state SET current = NULL;")
-sqlite_just_exec(database_queue_clear, "DELETE FROM queue;DELETE FROM sqlite_sequence WHERE name = 'queue';UPDATE queue_state SET current = NULL;")
-sqlite_just_exec(database_config_queue_default, "UPDATE queue_state SET volume = 100, paused = 1, random = 0, repeat = 0, single = 0, consume = 0, current = NULL, duration = 0;")
+sqlite_just_exec(database_queue_toggle_pause,   "UPDATE queue_state SET paused = 1 - paused;")
+sqlite_just_exec(database_queue_crop,           "DELETE FROM queue WHERE queue.kara_id <>"
+                                                " (SELECT current FROM queue_state LIMIT 1);")
+sqlite_just_exec(database_queue_stop,           "UPDATE queue_state SET current = NULL;")
+sqlite_just_exec(database_queue_clear,          "DELETE FROM queue;"
+                                                "DELETE FROM queue_tmp;"
+                                                "DELETE FROM sqlite_sequence WHERE name = 'queue_tmp';"
+                                                "DELETE FROM sqlite_sequence WHERE name = 'queue';"
+                                                "UPDATE queue_state SET current = NULL;")
+sqlite_just_exec(database_config_queue_default, "UPDATE queue_state SET volume = 100, paused = 1,"
+                                                " random = 0, repeat = 0, single = 0, consume = 0,"
+                                                " current = NULL, duration = 0;")
 #undef sqlite_just_exec
 // *INDENT-ON*