diff --git a/core/mplayer.c b/core/mplayer.c
index f766246f63..67d82fdb35 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -4289,6 +4289,14 @@ goto_reopen_demuxer: ;
     if (mpctx->timeline)
         timeline_set_part(mpctx, mpctx->timeline_part, true);
 
+    // Decide correct-pts mode based on first segment of video track
+    opts->correct_pts = opts->user_correct_pts;
+    if (opts->correct_pts < 0) {
+        opts->correct_pts =
+            demux_control(mpctx->demuxer, DEMUXER_CTRL_CORRECT_PTS,
+                          NULL) == DEMUXER_CTRL_OK;
+    }
+
     mpctx->initialized_flags |= INITIALIZED_DEMUXER;
 
     add_subtitle_fonts_from_sources(mpctx);
diff --git a/demux/demux.c b/demux/demux.c
index 379a74f654..369e7f3226 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -981,11 +981,6 @@ static struct demuxer *open_given_type(struct MPOpts *opts,
             demuxer = demux2;
         }
         demuxer->file_format = fformat;
-        opts->correct_pts = opts->user_correct_pts;
-        if (opts->correct_pts < 0)
-            opts->correct_pts =
-                demux_control(demuxer, DEMUXER_CTRL_CORRECT_PTS,
-                            NULL) == DEMUXER_CTRL_OK;
         if (stream_manages_timeline(demuxer->stream)) {
             // Incorrect, but fixes some behavior with DVD/BD
             demuxer->ts_resets_possible = false;