diff --git a/ChangeLog b/ChangeLog
index 796af2d47e..e40da34793 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-19  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/wavparse/gstwavparse.c: (gst_wavparse_stream_headers):
+	  Streaming mode fixes: don't unref buffer we don't own any longer;
+	  remove bogus adapter flush. Fixes #419338.
+
 2007-03-17  David Schleef  <ds@schleef.org>
 
 	* REQUIREMENTS: Change the format to key/value, add a bunch of
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 00da901537..5be19888af 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -1087,12 +1087,7 @@ gst_wavparse_stream_headers (GstWavParse * wav)
                 &extra)))
       goto parse_header_error;
 
-    if (wav->streaming) {
-      gst_adapter_flush (wav->adapter, size);
-      wav->offset += size;
-      gst_buffer_unref (buf);
-      buf = NULL;
-    }
+    buf = NULL;                 /* parse_strf_auds() took ownership of buffer */
 
     /* Note: gst_riff_create_audio_caps might need to fix values in
      * the header header depending on the format, so call it first */