diff --git a/ChangeLog b/ChangeLog
index 1418f68cbe..4d2eae47b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-02  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/matroska/matroska-demux.c:
+	(gst_matroska_demux_loop_stream_parse_id):
+	If no Tracks are found error out instead of trying it again until the
+	end of time.
+
 2008-08-02  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps):
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index bea8c8c4fc..0b75ddf4d0 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -4546,7 +4546,7 @@ gst_matroska_demux_loop_stream_parse_id (GstMatroskaDemux * demux,
         }
 
         if (ret != GST_FLOW_OK)
-          break;
+          return ret;
 
         demux->state = GST_MATROSKA_DEMUX_STATE_DATA;
         /* send initial discont */
@@ -4601,7 +4601,7 @@ gst_matroska_demux_loop_stream_parse_id (GstMatroskaDemux * demux,
         return ret;
       break;
   }
-  return GST_FLOW_OK;
+  return ret;
 }
 
 static GstFlowReturn