diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c
index 2fde8a28f4..1d5379778c 100644
--- a/gst-libs/gst/app/gstappsrc.c
+++ b/gst-libs/gst/app/gstappsrc.c
@@ -938,8 +938,12 @@ gst_app_src_query (GstBaseSrc * src, GstQuery * query)
         gst_query_set_duration (query, format, priv->size);
         res = TRUE;
       } else if (format == GST_FORMAT_TIME) {
-        gst_query_set_duration (query, format, priv->duration);
-        res = TRUE;
+        if (priv->duration != GST_CLOCK_TIME_NONE) {
+          gst_query_set_duration (query, format, priv->duration);
+          res = TRUE;
+        } else {
+          res = FALSE;
+        }
       } else {
         res = FALSE;
       }