diff --git a/gst/autoconvert/gstautoconvert.c b/gst/autoconvert/gstautoconvert.c
index 07c8b96b5f..bed2476c12 100644
--- a/gst/autoconvert/gstautoconvert.c
+++ b/gst/autoconvert/gstautoconvert.c
@@ -1200,9 +1200,10 @@ gst_auto_convert_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
   GstElement *subelement;
 
   if (GST_QUERY_TYPE (query) == GST_QUERY_CAPS) {
-    GstCaps *caps;
+    GstCaps *filter, *caps;
 
-    caps = gst_caps_new_any ();
+    gst_query_parse_caps (query, &filter);
+    caps = gst_auto_convert_getcaps (autoconvert, filter, GST_PAD_SRC);
     gst_query_set_caps_result (query, caps);
     gst_caps_unref (caps);