diff --git a/ChangeLog b/ChangeLog
index 7dbfdb1774..315866bf2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-25  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst/flv/gstflvdemux.c: (gst_flv_demux_query):
+	Forward unknown queries upstream instead of returning FALSE on them.
+
 2008-04-25  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* configure.ac:
diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c
index 0d8d087ccd..045b3450fd 100644
--- a/gst/flv/gstflvdemux.c
+++ b/gst/flv/gstflvdemux.c
@@ -979,6 +979,7 @@ gst_flv_demux_query (GstPad * pad, GstQuery * query)
       break;
     }
     case GST_QUERY_LATENCY:
+    default:
     {
       GstPad *peer;
 
@@ -992,9 +993,6 @@ gst_flv_demux_query (GstPad * pad, GstQuery * query)
       }
       break;
     }
-    default:
-      res = FALSE;
-      break;
   }
 
 beach: