diff --git a/ChangeLog b/ChangeLog
index 3e6a4b9e39..7f33410c55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-17  Edward Hervey  <edward@fluendo.com>
+
+	* plugins/elements/gstqueue.c: (gst_queue_push_one):
+	The queue is not responsible for pushing an EOS when receiving a fatal
+	flow error. It's up to the real element driving the pipeline to do that.
+
 2006-05-16  Edward Hervey  <edward@fluendo.com>
 
 	* plugins/elements/gstqueue.c: (gst_queue_push_one):
diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 960669976d..b399f07599 100644
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -777,8 +777,6 @@ gst_queue_push_one (GstQueue * queue)
       flowname = gst_flow_get_name (result);
 
       queue->srcresult = result;
-      if (GST_FLOW_IS_FATAL (result))
-        gst_pad_push_event (queue->srcpad, gst_event_new_eos ());
 
       GST_DEBUG_OBJECT (queue, "pausing queue, reason %s", flowname);
       gst_pad_pause_task (queue->srcpad);