diff --git a/core/mplayer.c b/core/mplayer.c
index d9c03dace5..a4b68f7402 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -4230,7 +4230,7 @@ goto_reopen_demuxer: ;
 
     mpctx->audio_delay = opts->audio_delay;
 
-    mpctx->demuxer = demux_open(mpctx->stream, NULL, NULL, opts);
+    mpctx->demuxer = demux_open(mpctx->stream, opts->demuxer_name, NULL, opts);
     mpctx->master_demuxer = mpctx->demuxer;
 
     if (!mpctx->demuxer) {
diff --git a/demux/demux.c b/demux/demux.c
index 1783f92c96..873821f250 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -580,8 +580,6 @@ struct demuxer *demux_open(struct stream *stream, char *force_format,
     const int *check_levels = d_normal;
     const struct demuxer_desc *check_desc = NULL;
 
-    if (!force_format)
-        force_format = opts->demuxer_name;
     if (!force_format)
         force_format = stream->demuxer;