diff --git a/ChangeLog b/ChangeLog
index 324da83f33..99048c9ff1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-17  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* libs/gst/base/gstbasesrc.c: (gst_base_src_default_query):
+	  JITTER, RATE, and LATENCY query should be handled by the
+	  default case and not by the CONVERT query code.
+
 2006-09-17  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/gstformat.c: (gst_format_register):
diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index 9be787006f..97927a42db 100644
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -642,9 +642,6 @@ gst_base_src_default_query (GstBaseSrc * src, GstQuery * query)
       res = TRUE;
       break;
     }
-    case GST_QUERY_LATENCY:
-    case GST_QUERY_JITTER:
-    case GST_QUERY_RATE:
     case GST_QUERY_CONVERT:
     {
       GstFormat src_fmt, dest_fmt;
@@ -662,6 +659,9 @@ gst_base_src_default_query (GstBaseSrc * src, GstQuery * query)
       gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
       break;
     }
+    case GST_QUERY_LATENCY:
+    case GST_QUERY_JITTER:
+    case GST_QUERY_RATE:
     default:
       res = FALSE;
       break;