diff --git a/ChangeLog b/ChangeLog
index 3e72c0736f..290cfc37c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-04  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst/rtpmanager/gstrtpjitterbuffer.c:
+	(gst_rtp_jitter_buffer_loop):
+	Don't unref the popped buffer when we don't have ownership.
+	Fixes #507020.
+
 2008-01-03  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* gst/mpegtsparse/Makefile.am:
diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c
index 76226229ed..64acc4ba03 100644
--- a/gst/rtpmanager/gstrtpjitterbuffer.c
+++ b/gst/rtpmanager/gstrtpjitterbuffer.c
@@ -971,7 +971,7 @@ static void
 gst_rtp_jitter_buffer_loop (GstRtpJitterBuffer * jitterbuffer)
 {
   GstRtpJitterBufferPrivate *priv;
-  GstBuffer *outbuf = NULL;
+  GstBuffer *outbuf;
   GstFlowReturn result;
   guint16 seqnum;
   GstClockTime timestamp, out_time;
@@ -1152,8 +1152,6 @@ flushing:
   {
     GST_DEBUG_OBJECT (jitterbuffer, "we are flushing");
     gst_pad_pause_task (priv->srcpad);
-    if (outbuf)
-      gst_buffer_unref (outbuf);
     JBUF_UNLOCK (priv);
     return;
   }