diff --git a/gst/rtp/gstrtph264pay.c b/gst/rtp/gstrtph264pay.c
index 17f94eee98..4dce2b87d1 100644
--- a/gst/rtp/gstrtph264pay.c
+++ b/gst/rtp/gstrtph264pay.c
@@ -55,8 +55,8 @@ gst_rtp_h264_aggregate_mode_get_type (void)
   static GType type = 0;
   static const GEnumValue values[] = {
     {GST_RTP_H264_AGGREGATE_NONE, "Do not aggregate NAL units", "none"},
-    {GST_RTP_H264_AGGREGATE_ZERO_LATENCY, "Aggregate all that arrive together",
-        "zero-latency"},
+    {GST_RTP_H264_AGGREGATE_ZERO_LATENCY,
+        "Aggregate NAL units until a VCL unit is included", "zero-latency"},
     {GST_RTP_H264_AGGREGATE_MAX_STAP,
         "Aggregate all NAL units with the same timestamp (adds one frame of"
           " latency)", "max-stap"},
@@ -1630,7 +1630,8 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
   }
 
   if (ret == GST_FLOW_OK &&
-      rtph264pay->aggregate_mode == GST_RTP_H264_AGGREGATE_ZERO_LATENCY) {
+      rtph264pay->aggregate_mode == GST_RTP_H264_AGGREGATE_ZERO_LATENCY &&
+      rtph264pay->bundle_contains_vcl) {
     GST_DEBUG_OBJECT (rtph264pay, "sending bundle at end incoming packet");
     ret = gst_rtp_h264_pay_send_bundle (rtph264pay, FALSE);
   }
diff --git a/gst/rtp/gstrtph265pay.c b/gst/rtp/gstrtph265pay.c
index 7cfeef25a6..3e46d29549 100644
--- a/gst/rtp/gstrtph265pay.c
+++ b/gst/rtp/gstrtph265pay.c
@@ -51,7 +51,8 @@ gst_rtp_h265_aggregate_mode_get_type (void)
   static GType type = 0;
   static const GEnumValue values[] = {
     {GST_RTP_H265_AGGREGATE_NONE, "Do not aggregate NAL units", "none"},
-    {GST_RTP_H265_AGGREGATE_ZERO_LATENCY, "Aggregate all that arrive together",
+    {GST_RTP_H265_AGGREGATE_ZERO_LATENCY,
+          "Aggregate NAL units until a VCL or suffix unit is included",
         "zero-latency"},
     {GST_RTP_H265_AGGREGATE_MAX,
         "Aggregate all NAL units with the same timestamp (adds one frame of"
@@ -1648,7 +1649,8 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
   }
 
   if (ret == GST_FLOW_OK &&
-      rtph265pay->aggregate_mode == GST_RTP_H265_AGGREGATE_ZERO_LATENCY) {
+      rtph265pay->aggregate_mode == GST_RTP_H265_AGGREGATE_ZERO_LATENCY &&
+      rtph265pay->bundle_contains_vcl) {
     GST_DEBUG_OBJECT (rtph265pay, "sending bundle at end incoming packet");
     ret = gst_rtp_h265_pay_send_bundle (rtph265pay, FALSE);
   }
diff --git a/tests/check/elements/rtp-payloading.c b/tests/check/elements/rtp-payloading.c
index bd430e749d..f536c4d61e 100644
--- a/tests/check/elements/rtp-payloading.c
+++ b/tests/check/elements/rtp-payloading.c
@@ -857,7 +857,7 @@ static int rtp_h264_list_lt_mtu_frame_count = 2;
 
 /* NAL = 4 bytes */
 /* also 2 bytes FU-A header each time */
-static int rtp_h264_list_lt_mtu_bytes_sent = 2 * (16 - 4);
+static int rtp_h264_list_lt_mtu_bytes_sent = (16 - 4);
 
 static int rtp_h264_list_lt_mtu_mtu_size = 1024;
 
diff --git a/tests/check/elements/rtph264.c b/tests/check/elements/rtph264.c
index c057bed0e3..51bd041807 100644
--- a/tests/check/elements/rtph264.c
+++ b/tests/check/elements/rtph264.c
@@ -531,7 +531,7 @@ static guint8 h264_idr_slice_2[] = {
  * such a NAL from the outside gets ignored properly. */
 GST_START_TEST (test_rtph264pay_reserved_nals)
 {
-  GstHarness *h = gst_harness_new ("rtph264pay");
+  GstHarness *h = gst_harness_new_parse ("rtph264pay aggregate-mode=none");
   /* we simply hack an AUD with the reserved nal types */
   guint8 nal_24[sizeof (h264_aud)];
   guint8 nal_25[sizeof (h264_aud)];
@@ -1049,6 +1049,49 @@ GST_START_TEST (test_rtph264pay_aggregate_with_discont)
 
 GST_END_TEST;
 
+GST_START_TEST (test_rtph264pay_aggregate_until_vcl)
+{
+  GstHarness *h = gst_harness_new_parse ("rtph264pay timestamp-offset=123"
+      " name=p");
+  GstFlowReturn ret;
+  GstBuffer *buffer;
+  GstRTPBuffer rtp = GST_RTP_BUFFER_INIT;
+
+  gst_harness_set_src_caps_str (h,
+      "video/x-h264,alignment=nal,stream-format=byte-stream");
+
+  buffer = wrap_static_buffer_with_pts (h264_sps, sizeof (h264_sps), 0);
+  ret = gst_harness_push (h, buffer);
+  fail_unless_equals_int (ret, GST_FLOW_OK);
+
+  buffer = wrap_static_buffer_with_pts (h264_pps, sizeof (h264_pps), 0);
+  ret = gst_harness_push (h, buffer);
+  fail_unless_equals_int (ret, GST_FLOW_OK);
+
+  buffer = wrap_static_buffer_with_pts (h264_idr_slice_1,
+      sizeof (h264_idr_slice_1), 0);
+  ret = gst_harness_push (h, buffer);
+  fail_unless_equals_int (ret, GST_FLOW_OK);
+
+
+  fail_unless_equals_int (gst_harness_buffers_in_queue (h), 1);
+
+  buffer = gst_harness_pull (h);
+  fail_unless (gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp));
+  fail_unless_equals_uint64 (GST_BUFFER_PTS (buffer), 0);
+  fail_unless_equals_uint64 (gst_rtp_buffer_get_timestamp (&rtp), 123);
+  /* RTP header = 12,  STAP header = 1, 2 bytes length per NAL */
+  fail_unless_equals_int (gst_buffer_get_size (buffer), 12 + 1 +
+      (2 + sizeof (h264_sps) - 4) +
+      (2 + sizeof (h264_pps) - 4) + (2 + sizeof (h264_idr_slice_1) - 4));
+  gst_rtp_buffer_unmap (&rtp);
+  gst_buffer_unref (buffer);
+
+  gst_harness_teardown (h);
+}
+
+GST_END_TEST;
+
 static Suite *
 rtph264_suite (void)
 {
@@ -1073,6 +1116,7 @@ rtph264_suite (void)
   tcase_add_test (tc_chain, test_rtph264pay_aggregate_with_aud);
   tcase_add_test (tc_chain, test_rtph264pay_aggregate_with_ts_change);
   tcase_add_test (tc_chain, test_rtph264pay_aggregate_with_discont);
+  tcase_add_test (tc_chain, test_rtph264pay_aggregate_until_vcl);
 
   return s;
 }
diff --git a/tests/check/elements/rtph265.c b/tests/check/elements/rtph265.c
index 36b0341718..07155ad4c8 100644
--- a/tests/check/elements/rtph265.c
+++ b/tests/check/elements/rtph265.c
@@ -417,6 +417,28 @@ GST_END_TEST;
  *     ! fakesink dump=1
  */
 
+static guint8 h265_vps[] = {
+  0x00, 0x00, 0x00, 0x01, 0x40, 0x01, 0x0c, 0x01,
+  0xff, 0xff, 0x01, 0x60, 0x00, 0x00, 0x03, 0x00,
+  0x90, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00,
+  0x3f, 0x95, 0x98, 0x09
+};
+
+static guint8 h265_sps[] = {
+  0x00, 0x00, 0x00, 0x01, 0x42, 0x01, 0x01, 0x01,
+  0x60, 0x00, 0x00, 0x03, 0x00, 0x90, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x03, 0x00, 0x3f, 0xa0, 0x08,
+  0x08, 0x04, 0x05, 0x96, 0x56, 0x69, 0x24, 0xca,
+  0xff, 0xf0, 0x00, 0x10, 0x00, 0x10, 0x10, 0x00,
+  0x00, 0x03, 0x00, 0x10, 0x00, 0x00, 0x03, 0x01,
+  0xe0, 0x80
+};
+
+static guint8 h265_pps[] = {
+  0x00, 0x00, 0x00, 0x01, 0x44, 0x01, 0xc1, 0x72,
+  0xb4, 0x42, 0x40
+};
+
 /* IDR Slice 1 */
 static guint8 h265_idr_slice_1[] = {
   0x00, 0x00, 0x00, 0x01, 0x28, 0x01, 0xaf, 0x08,
@@ -906,6 +928,57 @@ GST_START_TEST (test_rtph265pay_aggregate_with_discont)
 
 GST_END_TEST;
 
+
+GST_START_TEST (test_rtph265pay_aggregate_until_vcl)
+{
+  GstHarness *h = gst_harness_new_parse ("rtph265pay timestamp-offset=123"
+      " name=p");
+  GstFlowReturn ret;
+  GstBuffer *buffer;
+  GstRTPBuffer rtp = GST_RTP_BUFFER_INIT;
+
+  gst_harness_set_src_caps_str (h,
+      "video/x-h265,alignment=nal,stream-format=byte-stream");
+
+  buffer = wrap_static_buffer_with_pts (h265_vps, sizeof (h265_vps), 0);
+  ret = gst_harness_push (h, buffer);
+  fail_unless_equals_int (ret, GST_FLOW_OK);
+
+  buffer = wrap_static_buffer_with_pts (h265_sps, sizeof (h265_sps), 0);
+  ret = gst_harness_push (h, buffer);
+  fail_unless_equals_int (ret, GST_FLOW_OK);
+
+  buffer = wrap_static_buffer_with_pts (h265_pps, sizeof (h265_pps), 0);
+  ret = gst_harness_push (h, buffer);
+  fail_unless_equals_int (ret, GST_FLOW_OK);
+
+  buffer = wrap_static_buffer_with_pts (h265_idr_slice_1,
+      sizeof (h265_idr_slice_1), 0);
+  ret = gst_harness_push (h, buffer);
+  fail_unless_equals_int (ret, GST_FLOW_OK);
+
+
+  fail_unless_equals_int (gst_harness_buffers_in_queue (h), 1);
+
+  buffer = gst_harness_pull (h);
+  fail_unless (gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp));
+  fail_unless_equals_uint64 (GST_BUFFER_PTS (buffer), 0);
+  fail_unless_equals_uint64 (gst_rtp_buffer_get_timestamp (&rtp), 123);
+  /* RTP header = 12,  STAP header = 2, 2 bytes length per NAL */
+  fail_unless_equals_int (gst_buffer_get_size (buffer), 12 + 2 +
+      (2 + sizeof (h265_vps) - 4) +
+      (2 + sizeof (h265_sps) - 4) +
+      (2 + sizeof (h265_pps) - 4) + (2 + sizeof (h265_idr_slice_1) - 4));
+  gst_rtp_buffer_unmap (&rtp);
+  gst_buffer_unref (buffer);
+
+  gst_harness_teardown (h);
+}
+
+GST_END_TEST;
+
+
+
 static Suite *
 rtph265_suite (void)
 {
@@ -930,6 +1003,7 @@ rtph265_suite (void)
   tcase_add_test (tc_chain, test_rtph265pay_aggregate_with_aud);
   tcase_add_test (tc_chain, test_rtph265pay_aggregate_with_ts_change);
   tcase_add_test (tc_chain, test_rtph265pay_aggregate_with_discont);
+  tcase_add_test (tc_chain, test_rtph265pay_aggregate_until_vcl);
 
   return s;
 }