diff --git a/ChangeLog b/ChangeLog
index c8ebdef7bd..5280e004a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-07  Benjamin Otte  <otte@gnome.org>
+
+	* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
+	  handle discont events if they happen before caps nego
+
 2004-06-07  Wim Taymans  <wim@fluendo.com>
 
 	* gst/multipart/multipartdemux.c: (gst_multipart_demux_base_init),
@@ -20,6 +25,7 @@
 	  - check for soundcard.h in different places for some BSD
 
 2004-06-07  Jan Schmidt <thaytan@mad.scientist.com>
+
 	* AUTHORS:
 	Add me to the authors file
 	* configure.ac:
diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c
index 7743d332d8..049ce7e238 100644
--- a/ext/alsa/gstalsasink.c
+++ b/ext/alsa/gstalsasink.c
@@ -216,7 +216,7 @@ gst_alsa_sink_check_event (GstAlsaSink * sink, gint pad_nr)
         if (pad_nr != 0) {
           break;
         }
-        delay =
+        delay = (this->format == NULL) ? 0 :
             GST_SECOND * this->transmitted / this->format->rate -
             gst_alsa_sink_get_time (this);
         if (gst_event_discont_get_value (event, GST_FORMAT_TIME, &value)) {