diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp
index 08b55eeb..13f5bcfb 100644
--- a/Source/C++/Core/Ap4LinearReader.cpp
+++ b/Source/C++/Core/Ap4LinearReader.cpp
@@ -460,6 +460,7 @@ AP4_LinearReader::Advance(bool read_data)
             }
             if (AP4_FAILED(result)) {
                 delete buffer;
+                next_tracker->m_NextSample = NULL;
                 return result;
             }