diff --git a/ChangeLog b/ChangeLog
index 90d6d82a9c..ac4ba5b815 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-16  Wim Taymans  <wim.taymans@gmail.com>
+
+	* gst/playback/gstplaybasebin.c: (queue_threshold_reached):
+	Only post buffering messages when we are a stream.
+
 2007-08-15  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-libs/gst/pbutils/install-plugins.c:
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 92cbfd863d..3adc6a2eec 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -685,7 +685,8 @@ queue_threshold_reached (GstElement * queue, GstPlayBaseBin * play_base_bin)
 
   /* we post a 100% buffering message to notify the app that buffering is
    * completed and playback can start/continue */
-  fill_buffer (play_base_bin, 100);
+  if (play_base_bin->is_stream)
+    fill_buffer (play_base_bin, 100);
 }
 
 /* this signal will be fired when one of the queues with raw