diff --git a/src/base/commands.c b/src/base/commands.c
index 5fc5b0ac8eedd10e6ee2078d0400252c00fc4d60..72ea19bf06011f9486a09d36f99413e56092fbc3 100644
--- a/src/base/commands.c
+++ b/src/base/commands.c
@@ -245,7 +245,8 @@ 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);
+    RETURN_UNLESS(database_queue_clear(srv->db), "DB error on clear", false);
     MOD_PROC(srv->window_mod, "close");
     srv->mpd_idle_events |= MPD_IDLE_PLAYER;
     return true;
diff --git a/src/database/queue.c b/src/database/queue.c
index 1573e56557e7023618ed3cfdbfc0129cfef5966b..fbd07c5ad76bfdd7f3ad49bcedfb90830660dce2 100644
--- a/src/database/queue.c
+++ b/src/database/queue.c
@@ -19,10 +19,12 @@
         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_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*