diff --git a/.pick_status.json b/.pick_status.json
index abab8b5c82a..a6014bc9200 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3994,7 +3994,7 @@
         "description": "anv: fix compute push constant allocations on pre Gfx12.5 platforms",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/intel/vulkan/genX_simple_shader.c b/src/intel/vulkan/genX_simple_shader.c
index a425592a626..e6e926b28ca 100644
--- a/src/intel/vulkan/genX_simple_shader.c
+++ b/src/intel/vulkan/genX_simple_shader.c
@@ -448,11 +448,10 @@ genX(simple_shader_alloc_push)(struct anv_simple_shader *state, uint32_t size)
       s = anv_state_stream_alloc(state->dynamic_state_stream,
                                  size, ANV_UBO_ALIGNMENT);
    } else {
-#if GFX_VERx10 >= 125
-      s = anv_state_stream_alloc(state->general_state_stream, align(size, 64), 64);
-#else
-      s = anv_state_stream_alloc(state->dynamic_state_stream, size, 64);
-#endif
+      s = anv_state_stream_alloc(GFX_VERx10 >= 125 ?
+                                 state->general_state_stream :
+                                 state->dynamic_state_stream,
+                                 align(size, 64), 64);
    }
 
    if (s.map == NULL)