diff --git a/src/database/queue.c b/src/database/queue.c
index b0b5e5004f920781542caa950d243cae381e8618..4f8a4e8d8feadffe7cbd18848614351d04fc7cba 100644
--- a/src/database/queue.c
+++ b/src/database/queue.c
@@ -58,8 +58,8 @@ database_queue_current_kara(sqlite3 *db, struct kara_metadata *res)
     static const char *SQL_STMT =
         "SELECT song_name, source_name, category, language, author_name, song_type, song_number"
         " FROM kara"
-        " JOIN queue ON queue.kara_id = kara.id"
-        " JOIN queue_state ON queue_state.current = queue.position";
+        " JOIN queue_ ON kara_id = kara.id"
+        " JOIN queue_state ON current = position";
     sqlite3_stmt *stmt = 0;
     int ret = false;