diff --git a/ChangeLog b/ChangeLog
index d063961480..da1a706926 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-07  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/playback/gstdecodebin.c: (add_raw_queue):
+	If linking the raw pad with a queue fails, try it without a queue
+	instead of failing completely. This should never happen.
+
 2008-07-07  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	Patch by: Evgeniy Stepanov <eugeni dot stepanov at gmail dot com>
diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c
index 2bb8e79616..cbca08c59c 100644
--- a/gst/playback/gstdecodebin.c
+++ b/gst/playback/gstdecodebin.c
@@ -741,11 +741,13 @@ add_raw_queue (GstDecodeBin * decode_bin, GstPad * pad)
   queuesrcpad = gst_element_get_static_pad (queue, "src");
 
   if (gst_pad_link (pad, queuesinkpad) != GST_PAD_LINK_OK) {
+    GST_WARNING_OBJECT (decode_bin,
+        "Linking queue failed, trying without queue");
     gst_element_set_state (queue, GST_STATE_NULL);
     gst_object_unref (queuesrcpad);
     gst_object_unref (queuesinkpad);
     gst_bin_remove (GST_BIN (decode_bin), queue);
-    return NULL;
+    return pad;
   }
 
   decode_bin->queues = g_list_append (decode_bin->queues, queue);