diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c
index af5b6369b7..a23947fea1 100644
--- a/gst/matroska/ebml-read.c
+++ b/gst/matroska/ebml-read.c
@@ -137,7 +137,10 @@ gst_ebml_peek_id_length (guint32 * _id, guint64 * _length, guint * _needed,
   /* ERRORS */
 peek_error:
   {
-    GST_WARNING_OBJECT (el, "peek failed, ret = %d", ret);
+    if (ret != GST_FLOW_FLUSHING)
+      GST_WARNING_OBJECT (el, "peek failed, ret = %s", gst_flow_get_name (ret));
+    else
+      GST_DEBUG_OBJECT (el, "peek failed, ret = %s", gst_flow_get_name (ret));
     *_needed = needed;
     return ret;
   }
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index e25f6769a2..1e8a560262 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -4525,9 +4525,11 @@ gst_matroska_demux_loop (GstPad * pad)
 
   ret = gst_matroska_read_common_peek_id_length_pull (&demux->common,
       GST_ELEMENT_CAST (demux), &id, &length, &needed);
-  if (ret == GST_FLOW_EOS)
+  if (ret == GST_FLOW_EOS) {
     goto eos;
-  if (ret != GST_FLOW_OK) {
+  } else if (ret == GST_FLOW_FLUSHING) {
+    goto pause;
+  } else if (ret != GST_FLOW_OK) {
     if (gst_matroska_demux_check_parse_error (demux))
       goto pause;
     else