diff --git a/ChangeLog b/ChangeLog
index 2d8cb62c75..1e9855d4a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-02  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* ext/ogg/gstoggdemux.c: (gst_ogg_demux_activate_chain),
+	(gst_ogg_demux_read_chain):
+	Refix oggdemux, we only have a problem if we failed to find a chain and
+	we are not EOF.
+
 2008-04-02  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	Patch by: Victor STINNER <victor dot stinner at haypocalc dot com>
diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 4b38965cbc..72a321e662 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -2357,7 +2357,7 @@ gst_ogg_demux_read_chain (GstOggDemux * ogg, GstOggChain ** res_chain)
   }
 
   if (ret != GST_FLOW_OK || chain == NULL) {
-    if (chain == NULL) {
+    if (ret == GST_FLOW_OK) {
       GST_WARNING_OBJECT (ogg, "no chain was found");
       ret = GST_FLOW_ERROR;
     } else if (ret != GST_FLOW_UNEXPECTED) {