diff --git a/src/gallium/drivers/d3d12/d3d12_video_encoder_nalu_writer_h264.cpp b/src/gallium/drivers/d3d12/d3d12_video_encoder_nalu_writer_h264.cpp
index 64de80b4301..05272945135 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_encoder_nalu_writer_h264.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_video_encoder_nalu_writer_h264.cpp
@@ -692,14 +692,15 @@ d3d12_video_nalu_writer_h264::write_slice_svc_prefix(const H264_SLICE_PREFIX_SVC
    {
       rbsp.put_bits(1, nal_svc_prefix.store_ref_base_pic_flag);
       rbsp.put_bits(1, 0 /* additional_prefix_nal_unit_extension_flag */);
+
+      rbsp_trailing(&rbsp);
+      rbsp.flush();
    }
    else
    {
       // No more_rbsp_data( ) so we don't need to code anything else
    }
 
-   rbsp_trailing(&rbsp);
-   rbsp.flush();
    if (wrap_rbsp_into_nalu(&nalu, &rbsp, nal_svc_prefix.nal_ref_idc, NAL_TYPE_PREFIX, &nal_svc_prefix) <= 0u) {
 
       debug_printf(