diff --git a/ChangeLog b/ChangeLog
index a2836a0a4c..7e7568c378 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-02  Wim Taymans  <wim.taymans@gmail.com>
+
+	* gst-libs/gst/audio/gstbaseaudiosink.c:
+	(gst_base_audio_sink_async_play):
+	When slaved to the clock, don't try to align a sample with the previous
+	one when going to PLAYING again.
+
 2007-10-02  Stefan Kost  <ensonic@users.sf.net>
 
 	* tests/examples/snapshot/snapshot.c:
diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c
index d3dcfa0141..ee39bbb6a4 100644
--- a/gst-libs/gst/audio/gstbaseaudiosink.c
+++ b/gst-libs/gst/audio/gstbaseaudiosink.c
@@ -1291,6 +1291,7 @@ gst_base_audio_sink_async_play (GstBaseSink * basesink)
   itime = gst_clock_get_internal_time (sink->provided_clock);
 
   sink->priv->avg_skew = -1;
+  sink->next_sample = -1;
 
   GST_DEBUG_OBJECT (sink,
       "internal time: %" GST_TIME_FORMAT " external time: %" GST_TIME_FORMAT,