diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
index ce61aeeb..185672b9 100644
--- a/src/bmffimage.cpp
+++ b/src/bmffimage.cpp
@@ -110,7 +110,7 @@ static bool skipBox(uint32_t box) {
   // Allows boxHandler() to optimise the reading of files by identifying
   // box types that we're not interested in. Box types listed here must
   // not appear in the cases in switch (box_type) in boxHandler().
-  return box == TAG_mdat;  // mdat is where the main image lives and can be huge
+  return box == 0 || box == TAG_mdat;  // mdat is where the main image lives and can be huge
 }
 
 std::string BmffImage::mimeType() const {
@@ -277,6 +277,11 @@ uint64_t BmffImage::boxHandler(std::ostream& out /* = std::cout*/, Exiv2::PrintS
     box_length = data.read_uint64(0, endian_);
   }
 
+  if (box_length == 0) {
+    // Zero length is also valid and indicates box extends to the end of file.
+    box_length = pbox_end - address;
+  }
+
   // read data in box and restore file position
   const size_t restore = io_->tell();
   Internal::enforce(box_length >= hdrsize, Exiv2::ErrorCode::kerCorruptedMetadata);
diff --git a/test/data/pr_2612_poc.heic b/test/data/pr_2612_poc.heic
new file mode 100644
index 00000000..036c6cf3
Binary files /dev/null and b/test/data/pr_2612_poc.heic differ
diff --git a/test/data/test_reference_files/pr_2612_poc.heic.out b/test/data/test_reference_files/pr_2612_poc.heic.out
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/test/data/test_reference_files/pr_2612_poc.heic.out
@@ -0,0 +1 @@
+