diff --git a/ChangeLog b/ChangeLog
index db3f6ef423..e0b95338b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-28  Wim Taymans  <wim@fluendo.com>
+
+	* gst-libs/gst/audio/gstbaseaudiosink.c:
+	(gst_base_audio_sink_provide_clock):
+	Don't try to provide a clock in the NULL state.
+
 2006-02-28  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_demux_receive_event),
diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c
index 58ff3e3cca..26026cb901 100644
--- a/gst-libs/gst/audio/gstbaseaudiosink.c
+++ b/gst-libs/gst/audio/gstbaseaudiosink.c
@@ -181,6 +181,10 @@ gst_base_audio_sink_provide_clock (GstElement * elem)
 
   sink = GST_BASE_AUDIO_SINK (elem);
 
+  /* we have no ringbuffer (must be NULL state */
+  if (sink->ringbuffer == NULL)
+    goto wrong_state;
+
   if (!gst_ring_buffer_is_acquired (sink->ringbuffer))
     goto wrong_state;