diff --git a/ChangeLog b/ChangeLog
index 6218e435dc..9bcc87dd84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-31  Wim Taymans  <wim@fluendo.com>
+
+	* gst-libs/gst/audio/gstringbuffer.c: (gst_ringbuffer_delay):
+	Don't try to call the delay method when the device is not
+	opened.
+
 2005-05-31  Wim Taymans  <wim@fluendo.com>
 
 	* ext/alsa/gstalsasink.c: (set_hwparams), (gst_alsasink_open):
diff --git a/gst-libs/gst/audio/gstringbuffer.c b/gst-libs/gst/audio/gstringbuffer.c
index 9b13a2031b..36df08e005 100644
--- a/gst-libs/gst/audio/gstringbuffer.c
+++ b/gst-libs/gst/audio/gstringbuffer.c
@@ -431,6 +431,9 @@ gst_ringbuffer_delay (GstRingBuffer * buf)
 
   g_return_val_if_fail (buf != NULL, 0);
 
+  if (!gst_ringbuffer_is_acquired (buf))
+    return 0;
+
   rclass = GST_RINGBUFFER_GET_CLASS (buf);
   if (rclass->delay)
     res = rclass->delay (buf);