diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c
index c2d00adde9..7eab8063a0 100644
--- a/libs/gst/base/gstaggregator.c
+++ b/libs/gst/base/gstaggregator.c
@@ -690,11 +690,22 @@ eat:
   return res;
 }
 
+static gboolean
+_flush_pad (GstAggregator * self, GstAggregatorPad * pad, gpointer unused_udata)
+{
+  _aggpad_flush (pad, self);
+
+  return TRUE;
+}
+
 static gboolean
 _stop (GstAggregator * agg)
 {
   _reset_flow_values (agg);
 
+  gst_aggregator_iterate_sinkpads (agg,
+      (GstAggregatorPadForeachFunc) _flush_pad, NULL);
+
   return TRUE;
 }