diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 3f83d5ae7..e2f369ccc 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -771,8 +771,7 @@ void ViewerWidget::PlayInternal(int speed, bool in_to_out_only)
       prequeue_count_ = 0;
 
       for (int i=0; i<prequeue_length_; i++) {
-        RequestNextFrameForQueue(RenderTicketPriority::kNormal, false);
-        playback_queue_next_frame_ += playback_speed_;
+        RequestNextFrameForQueue();
       }
     }
   }
@@ -1095,11 +1094,16 @@ void ViewerWidget::RendererGeneratedFrameForQueue()
         foreach (ViewerDisplayWidget *dw, playback_devices_) {
           dw->queue()->AppendTimewise({ts, frame}, playback_speed_);
         }
-        prequeue_count_++;
 
-        if (prequeuing_video_ && prequeue_count_ == prequeue_length_) {
-          prequeuing_video_ = false;
-          FinishPlayPreprocess();
+        if (prequeuing_video_) {
+          prequeue_count_++;
+
+          if (prequeue_count_ == prequeue_length_) {
+            prequeuing_video_ = false;
+            FinishPlayPreprocess();
+          } else {
+            RequestNextFrameForQueue();
+          }
         }
       }
     }