diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c
index 822a09857d..f5739098a4 100644
--- a/gst-libs/gst/video/gstvideoencoder.c
+++ b/gst-libs/gst/video/gstvideoencoder.c
@@ -2410,7 +2410,9 @@ gst_video_encoder_finish_frame (GstVideoEncoder * encoder,
   GST_OBJECT_UNLOCK (encoder);
 
   if (G_UNLIKELY (send_headers))
-    gst_video_encoder_send_header_unlocked (encoder, &discont);
+    priv->new_headers = TRUE;
+
+  gst_video_encoder_send_header_unlocked (encoder, &discont);
 
   if (G_UNLIKELY (discont)) {
     GST_LOG_OBJECT (encoder, "marking discont");