diff --git a/ChangeLog b/ChangeLog
index 37d03ecb9c..65e69ecabc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-06  Wim Taymans  <wim@fluendo.com>
+
+	* gst-libs/gst/audio/gstbaseaudiosink.c:
+	(gst_base_audio_sink_async_play):
+	Fix regression that made GStreamer skip the first samples of audio.
+	Fixes #414684.
+
 2007-03-05  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* configure.ac:
diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c
index 4b0accae36..9911424ac6 100644
--- a/gst-libs/gst/audio/gstbaseaudiosink.c
+++ b/gst-libs/gst/audio/gstbaseaudiosink.c
@@ -1071,11 +1071,11 @@ gst_base_audio_sink_async_play (GstBaseSink * basesink)
         rate_num, rate_denom);
 
     gst_clock_set_master (sink->provided_clock, clock);
+
+    /* start ringbuffer so we can start slaving right away */
+    gst_ring_buffer_start (sink->ringbuffer);
   }
-
 no_clock:
-  gst_ring_buffer_start (sink->ringbuffer);
-
   return GST_STATE_CHANGE_SUCCESS;
 }