diff --git a/ChangeLog b/ChangeLog
index af314af83c..8506408df9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-30  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/volume/gstvolume.c: (gst_volume_class_init),
+	(volume_transform):
+          do not update controlled params, if buffer has no timestamp
+
 2005-08-29  Stefan Kost  <ensonic@users.sf.net>
 
 	* configure.ac:
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index ebc9662233..ef77ee6168 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -395,7 +395,8 @@ volume_transform (GstBaseTransform * base, GstBuffer * inbuf,
 {
   GstVolume *this = GST_VOLUME (base);
 
-  gst_object_sink_values (G_OBJECT (this), GST_BUFFER_TIMESTAMP (outbuf));
+  if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (outbuf)))
+    gst_object_sink_values (G_OBJECT (this), GST_BUFFER_TIMESTAMP (outbuf));
 
   this->process (this, GST_BUFFER_TIMESTAMP (outbuf),
       GST_BUFFER_DATA (outbuf), GST_BUFFER_SIZE (outbuf));