diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index e89cda6490..b001ea759d 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -158,6 +158,12 @@ static int render_video_to_output_surface(struct vo *vo,
     VdpStatus vdp_st;
     struct mp_image *mpi = vc->current_image;
 
+    vdp_st = vdp->presentation_queue_block_until_surface_idle(vc->flip_queue,
+                                                              output_surface,
+                                                              &dummy);
+    CHECK_VDP_WARNING(vo, "Error when calling "
+                      "vdp_presentation_queue_block_until_surface_idle");
+
     if (!mpi) {
         // At least clear the screen if there is nothing to render
         int flags = VDP_OUTPUT_SURFACE_RENDER_ROTATE_0;
@@ -168,12 +174,6 @@ static int render_video_to_output_surface(struct vo *vo,
         return -1;
     }
 
-    vdp_st = vdp->presentation_queue_block_until_surface_idle(vc->flip_queue,
-                                                              output_surface,
-                                                              &dummy);
-    CHECK_VDP_WARNING(vo, "Error when calling "
-                      "vdp_presentation_queue_block_until_surface_idle");
-
     if (vc->rgb_mode) {
         // Clear the borders between video and window (if there are any).
         // For some reason, video_mixer_render doesn't need it for YUV.