diff --git a/ChangeLog b/ChangeLog
index 142d6f0ff4..584f5b8627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-14  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* gst/gstqueue.c: (gst_queue_getcaps), (gst_queue_link):
+	  query if buffers are inside the pool, ignore events
+
 2004-01-13  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
 	* gst/gstclock.c: (gst_clock_class_init), (gst_clock_init),
diff --git a/gst/gstqueue.c b/gst/gstqueue.c
index 5f09408015..50cc5680a5 100644
--- a/gst/gstqueue.c
+++ b/gst/gstqueue.c
@@ -322,7 +322,7 @@ gst_queue_getcaps (GstPad *pad)
 
   queue = GST_QUEUE (gst_pad_get_parent (pad));
 
-  if (queue->queue->length > 0) {
+  if (queue->cur_level.bytes > 0) {
     return gst_caps_copy (queue->negotiated_caps);
   }
 
@@ -337,7 +337,7 @@ gst_queue_link (GstPad *pad, const GstCaps *caps)
 
   queue = GST_QUEUE (gst_pad_get_parent (pad));
 
-  if (queue->queue->length > 0) {
+  if (queue->cur_level.bytes > 0) {
     if (gst_caps_is_equal_fixed (caps, queue->negotiated_caps)) {
       return GST_PAD_LINK_OK;
     }
diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 5f09408015..50cc5680a5 100644
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -322,7 +322,7 @@ gst_queue_getcaps (GstPad *pad)
 
   queue = GST_QUEUE (gst_pad_get_parent (pad));
 
-  if (queue->queue->length > 0) {
+  if (queue->cur_level.bytes > 0) {
     return gst_caps_copy (queue->negotiated_caps);
   }
 
@@ -337,7 +337,7 @@ gst_queue_link (GstPad *pad, const GstCaps *caps)
 
   queue = GST_QUEUE (gst_pad_get_parent (pad));
 
-  if (queue->queue->length > 0) {
+  if (queue->cur_level.bytes > 0) {
     if (gst_caps_is_equal_fixed (caps, queue->negotiated_caps)) {
       return GST_PAD_LINK_OK;
     }