diff --git a/lib/segmentreader.cpp b/lib/segmentreader.cpp
index 2669a8af..d2a341f0 100644
--- a/lib/segmentreader.cpp
+++ b/lib/segmentreader.cpp
@@ -142,8 +142,8 @@ namespace Mist{
       }
 
       if (parser == STRM_TS){
-        if (currBuf->size() == currBuf->rsize()){tsStream.finish();}
-        if (tsStream.hasPacketOnEachTrack() || currBuf->size() == currBuf->rsize()){
+        if (currBuf->size() == currBuf->rsize() && offset + 188 > currBuf->size()){tsStream.finish();}
+        if (tsStream.hasPacketOnEachTrack() || (currBuf->size() == currBuf->rsize() && offset + 188 > currBuf->size())){
           if (!tsStream.hasPacket()){return false;}
           tsStream.getEarliestPacket(thisPacket);
           return true;