diff --git a/.pick_status.json b/.pick_status.json
index 25c0059d26d..ee5fd53acae 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1417,7 +1417,7 @@
         "description": "lavapipe: correctly update shader object per-stage push constant sizes",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8b3022c918086cd23b7f8a9e4dd61d1b074fef87"
     },
diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c
index ce5038a642d..7739598adf5 100644
--- a/src/gallium/frontends/lavapipe/lvp_execute.c
+++ b/src/gallium/frontends/lavapipe/lvp_execute.c
@@ -4102,7 +4102,7 @@ handle_shaders(struct vk_cmd_queue_entry *cmd, struct rendering_state *state)
       }
 
       if (stage != MESA_SHADER_COMPUTE) {
-         state->gfx_push_sizes[i] = shader ? shader->layout->push_constant_size : 0;
+         state->gfx_push_sizes[stage] = shader ? shader->layout->push_constant_size : 0;
          gfx = true;
       } else {
          state->push_size[1] = shader ? shader->layout->push_constant_size : 0;