diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
index 20d96ceec0..677e73b7ac 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
@@ -4285,6 +4285,9 @@ gst_vaapi_decoder_h264_decode_codec_data(GstVaapiDecoder *base_decoder,
             goto cleanup;
         ofs = pi->nalu.offset + pi->nalu.size;
 
+        pi->state = priv->parser_state;
+        pi->flags = 0;
+
         status = decode_sps(decoder, &unit);
         if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
             goto cleanup;
@@ -4315,6 +4318,9 @@ gst_vaapi_decoder_h264_decode_codec_data(GstVaapiDecoder *base_decoder,
             goto cleanup;
         ofs = pi->nalu.offset + pi->nalu.size;
 
+        pi->state = priv->parser_state;
+        pi->flags = 0;
+
         status = decode_pps(decoder, &unit);
         if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
             goto cleanup;