diff --git a/gst/rtp/gstrtpj2kpay.c b/gst/rtp/gstrtpj2kpay.c
index de4462e45b..6fc129c9cb 100644
--- a/gst/rtp/gstrtpj2kpay.c
+++ b/gst/rtp/gstrtpj2kpay.c
@@ -437,6 +437,11 @@ gst_rtp_j2k_pay_handle_buffer (GstBaseRTPPayload * basepayload,
       }
 
       pos = end;
+
+      /* exit when finished */
+      if (pos == size)
+        break;
+
       /* scan next packetization unit and fill in the header */
       end = find_pu_end (pay, data, size, pos, &state);
     } while (TRUE);