diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index da0c5a959d..eac30e6e2d 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1442,6 +1442,10 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
 
                     s->restart_count = 0;
                     /* nothing to do on SOI */
+                    if (s->got_picture) {
+                        av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n");
+                        goto eoi_parser;
+                    }
                     break;
                 case DQT:
                     ff_mjpeg_decode_dqt(s);