diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 7b61168277..fd40fdb275 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1471,7 +1471,7 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF
 
     if (!ctx)
         return AVERROR(ENOMEM);
-    while (avio_tell(pb) + 4 < klv_end) {
+    while (avio_tell(pb) + 4 < klv_end && !pb->eof_reached) {
         int ret;
         int tag = avio_rb16(pb);
         int size = avio_rb16(pb); /* KLV specified by 0x53 */