diff --git a/.pick_status.json b/.pick_status.json
index 6b1136d4942..bc7f9e67454 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "frontends/va: Fix updating AV1 rate control parameters",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "5edbecb8569d88e7faa28ca7a56eb5e1672a2dd0",
         "notes": null
diff --git a/src/gallium/frontends/va/picture_av1_enc.c b/src/gallium/frontends/va/picture_av1_enc.c
index 19348cf95ed..a260da69c04 100644
--- a/src/gallium/frontends/va/picture_av1_enc.c
+++ b/src/gallium/frontends/va/picture_av1_enc.c
@@ -258,34 +258,41 @@ VAStatus vlVaHandleVAEncPictureParameterBufferTypeAV1(vlVaDriver *drv, vlVaConte
 
 VAStatus vlVaHandleVAEncMiscParameterTypeRateControlAV1(vlVaContext *context, VAEncMiscParameterBuffer *misc)
 {
+   unsigned temporal_id;
    VAEncMiscParameterRateControl *rc = (VAEncMiscParameterRateControl *)misc->data;
    struct pipe_av1_enc_rate_control *pipe_rc = NULL;
 
-   for (int i = 1; i < ARRAY_SIZE(context->desc.av1enc.rc); i++) {
-      pipe_rc = &context->desc.av1enc.rc[i];
-      pipe_rc->rate_ctrl_method = context->desc.av1enc.rc[0].rate_ctrl_method;
-   }
+   temporal_id = context->desc.av1enc.rc[0].rate_ctrl_method !=
+                 PIPE_H2645_ENC_RATE_CONTROL_METHOD_DISABLE ?
+                 rc->rc_flags.bits.temporal_id :
+                 0;
 
-   for (int i = 0; i < ARRAY_SIZE(context->desc.av1enc.rc); i++)
-   {
-      pipe_rc = &context->desc.av1enc.rc[i];
+   if (context->desc.av1enc.seq.num_temporal_layers > 0 &&
+       temporal_id >= context->desc.av1enc.seq.num_temporal_layers)
+      return VA_STATUS_ERROR_INVALID_PARAMETER;
 
-      if (pipe_rc->rate_ctrl_method == PIPE_H2645_ENC_RATE_CONTROL_METHOD_CONSTANT)
-         pipe_rc->target_bitrate = pipe_rc->peak_bitrate;
-      else
-         pipe_rc->target_bitrate = pipe_rc->peak_bitrate * (rc->target_percentage / 100.0);
+   pipe_rc = &context->desc.av1enc.rc[temporal_id];
 
-      if (pipe_rc->target_bitrate < 2000000)
-         pipe_rc->vbv_buffer_size = MIN2((pipe_rc->target_bitrate * 2.75), 2000000);
-      else
-         pipe_rc->vbv_buffer_size = pipe_rc->target_bitrate;
+   if (pipe_rc->rate_ctrl_method == PIPE_H2645_ENC_RATE_CONTROL_METHOD_CONSTANT)
+      pipe_rc->target_bitrate = rc->bits_per_second;
+   else
+      pipe_rc->target_bitrate = rc->bits_per_second * (rc->target_percentage / 100.0);
+   pipe_rc->peak_bitrate = rc->bits_per_second;
+   if (pipe_rc->target_bitrate < 2000000)
+      pipe_rc->vbv_buffer_size = MIN2((pipe_rc->target_bitrate * 2.75), 2000000);
+   else
+      pipe_rc->vbv_buffer_size = pipe_rc->target_bitrate;
 
-      pipe_rc->fill_data_enable = !(rc->rc_flags.bits.disable_bit_stuffing);
-      pipe_rc->skip_frame_enable = 0;/* !(rc->rc_flags.bits.disable_frame_skip); */
+   pipe_rc->fill_data_enable = !(rc->rc_flags.bits.disable_bit_stuffing);
+   pipe_rc->skip_frame_enable = 0;/* !(rc->rc_flags.bits.disable_frame_skip); */
+   pipe_rc->max_qp = rc->max_qp;
+   pipe_rc->min_qp = rc->min_qp;
+   /* Distinguishes from the default params set for these values in other
+      functions and app specific params passed down */
+   pipe_rc->app_requested_qp_range = ((rc->max_qp > 0) || (rc->min_qp > 0));
 
-      if (pipe_rc->rate_ctrl_method == PIPE_H2645_ENC_RATE_CONTROL_METHOD_QUALITY_VARIABLE)
-         pipe_rc->vbr_quality_factor = rc->quality_factor;
-   }
+   if (pipe_rc->rate_ctrl_method == PIPE_H2645_ENC_RATE_CONTROL_METHOD_QUALITY_VARIABLE)
+      pipe_rc->vbr_quality_factor = rc->quality_factor;
 
    return VA_STATUS_SUCCESS;
 }