diff --git a/gst-libs/gst/video/gstbasevideocodec.h b/gst-libs/gst/video/gstbasevideocodec.h
index 6471c352f5..074537ae28 100644
--- a/gst-libs/gst/video/gstbasevideocodec.h
+++ b/gst-libs/gst/video/gstbasevideocodec.h
@@ -134,6 +134,7 @@ struct _GstVideoFrame
   GstClockTime deadline;
 
   gboolean force_keyframe;
+  gboolean force_keyframe_headers;
 
   /* Events that should be pushed downstream *before*
    * the next src_buffer */
diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index f884738dc7..8bef7e4490 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -859,6 +859,7 @@ gst_base_video_encoder_chain (GstPad * pad, GstBuffer * buf)
           "Forcing a key unit at running time %" GST_TIME_FORMAT,
           GST_TIME_ARGS (running_time));
       frame->force_keyframe = TRUE;
+      frame->force_keyframe_headers = fevt->all_headers;
       fevt->pending = TRUE;
     }
   }