diff --git a/gst/gstpad.c b/gst/gstpad.c
index c47a7fea32..138ed2eb52 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -1400,8 +1400,13 @@ gst_pad_needs_reconfigure (GstPad * pad)
   g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
 
   GST_OBJECT_LOCK (pad);
-  reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad);
-  GST_DEBUG_OBJECT (pad, "peeking RECONFIGURE flag %d", reconfigure);
+  if (GST_PAD_IS_FLUSHING (pad)) {
+    GST_DEBUG_OBJECT (pad, "pad is flushing");
+    reconfigure = FALSE;
+  } else {
+    reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad);
+    GST_DEBUG_OBJECT (pad, "peeking RECONFIGURE flag %d", reconfigure);
+  }
   GST_OBJECT_UNLOCK (pad);
 
   return reconfigure;
@@ -1424,10 +1429,15 @@ gst_pad_check_reconfigure (GstPad * pad)
   g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
 
   GST_OBJECT_LOCK (pad);
-  reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad);
-  if (reconfigure) {
-    GST_DEBUG_OBJECT (pad, "remove RECONFIGURE flag");
-    GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_RECONFIGURE);
+  if (GST_PAD_IS_FLUSHING (pad)) {
+    GST_DEBUG_OBJECT (pad, "pad is flushing");
+    reconfigure = FALSE;
+  } else {
+    reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad);
+    if (reconfigure) {
+      GST_DEBUG_OBJECT (pad, "remove RECONFIGURE flag");
+      GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_RECONFIGURE);
+    }
   }
   GST_OBJECT_UNLOCK (pad);