diff --git a/gst/mpegdemux/gstpesfilter.c b/gst/mpegdemux/gstpesfilter.c
index a2a6b76405..4285c94054 100644
--- a/gst/mpegdemux/gstpesfilter.c
+++ b/gst/mpegdemux/gstpesfilter.c
@@ -167,6 +167,9 @@ gst_pes_filter_parse (GstPESFilter * filter)
     avail = MIN (avail, filter->length + 6);
   }
 
+  if (avail < 7)
+    goto need_more_data;
+
   /* read more data, either the whole packet if there is a length
    * or whatever we have available if this in an unbounded packet. */
   if (!(data = gst_adapter_peek (filter->adapter, avail)))
@@ -198,9 +201,6 @@ gst_pes_filter_parse (GstPESFilter * filter)
       break;
   }
 
-  if (datalen < 1)
-    goto need_more_data;
-
   filter->pts = filter->dts = -1;
 
   /* stuffing bits, first two bits are '10' for mpeg2 pes so this code is