diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index ffbae57940..027066996b 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -516,6 +516,10 @@ int cue_find_track(const char *cue_path, bool first,
       }
    }
 
+   if (file_size != -1) {
+      last_index = file_size;
+   }
+
    if (update_cand(&cand_index, &last_index, &largest, last_file, offset,
                    size, track_path, max_len)) {
       rv = 0;