diff --git a/src/commands.c b/src/commands.c
index 161e89e4747f9c733abf73279abc95061509ca3b..f38599fbe8d44d0d7efbfe2941582e6725af9dc4 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -435,8 +435,8 @@ command_find(struct lkt_state *srv, size_t c, char *cmd_args[LKT_MESSAGE_ARGS_MA
     if (action & (LKT_FND_ACT_ADD | LKT_FND_ACT_ENQUEUE) && ! continuation) {
         search.call = (void(*)(void)) lkt_callback_send_row_v2;
         search.init = (void(*)(void)) database_queue_add_uri;
+        search.continuation = queue.length + 1;
         RETURN_UNLESS(database_queue_state(srv->db, &queue), "Failed to get the status of the queue", false);
-        search.continuation = queue.current + 1;
         srv->mpd_idle_events |= MPD_IDLE_PLAYLIST;
     }