diff --git a/player/loadfile.c b/player/loadfile.c
index 57c134c1e4..8dee862812 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1803,6 +1803,9 @@ static void play_current_file(struct MPContext *mpctx)
     update_screensaver_state(mpctx);
     clear_playlist_paths(mpctx);
 
+    // Clear out subs from the previous file if the video track is a still image.
+    redraw_subs(mpctx);
+
     if (watch_later)
         mp_delete_watch_later_conf(mpctx, mpctx->filename);
 
diff --git a/player/playloop.c b/player/playloop.c
index 770dee997d..b6b0ae4d65 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -659,9 +659,6 @@ static void handle_osd_redraw(struct MPContext *mpctx)
     if (!want_redraw)
         return;
     vo_redraw(mpctx->video_out);
-    // Even though we just redrew, it may need to be done again for certain
-    // cases of subtitles on an image.
-    redraw_subs(mpctx);
 }
 
 static void clear_underruns(struct MPContext *mpctx)