diff --git a/.pick_status.json b/.pick_status.json
index c76e5e491fe..9a65720273c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3854,7 +3854,7 @@
         "description": "anv: dirty all push constant stages in simple shader",
         "nominated": false,
         "nomination_type": 2,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "4fa1eddb4cff78dcb04dc03425d77bd30f9daa3d",
         "notes": null
diff --git a/src/intel/vulkan/genX_simple_shader.c b/src/intel/vulkan/genX_simple_shader.c
index 8e0aa1ab801..a425592a626 100644
--- a/src/intel/vulkan/genX_simple_shader.c
+++ b/src/intel/vulkan/genX_simple_shader.c
@@ -390,7 +390,9 @@ genX(emit_simpler_shader_init_fragment)(struct anv_simple_shader *state)
                                            ANV_CMD_DIRTY_XFB_ENABLE |
                                            ANV_CMD_DIRTY_OCCLUSION_QUERY_ACTIVE |
                                            ANV_CMD_DIRTY_INDEX_TYPE);
-   state->cmd_buffer->state.push_constants_dirty |= VK_SHADER_STAGE_FRAGMENT_BIT;
+   /* We're reprogramming push constants and also
+    * Wa_22011440098/Wa_18022330953 force us to reprogram */
+   state->cmd_buffer->state.push_constants_dirty |= VK_SHADER_STAGE_ALL_GRAPHICS;
    state->cmd_buffer->state.gfx.push_constant_stages = VK_SHADER_STAGE_FRAGMENT_BIT;
 }