diff --git a/ChangeLog b/ChangeLog
index 6501c7f763..06cdb90d78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-20  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* ext/esd/esdsink.c: (gst_esdsink_write):
+	When we post an error, we must return -1 to let the parent know that we
+	cannot write the segment else it will loop and continue to call us again
+	forever. Patch by Michael Meeks.
+
 2008-05-20  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/videomixer/videomixer.c:
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index d46af07bc8..ed34d793ce 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -413,7 +413,7 @@ write_error:
   {
     GST_ELEMENT_ERROR (esdsink, RESOURCE, WRITE,
         ("Failed to write data to the esound daemon"), GST_ERROR_SYSTEM);
-    return 0;
+    return -1;
   }
 }