diff --git a/.pick_status.json b/.pick_status.json
index c825e1554c8..d7855179d9b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1588,7 +1588,7 @@
         "description": "iris: Re-emit MEDIA_VFE_STATE for variable group size shaders",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "33c61eb2f10526c0b90c5ad376e5b0433aec296d"
     },
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index e493eea0b3c..9571aed3396 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -6905,7 +6905,8 @@ iris_upload_gpgpu_walker(struct iris_context *ice,
    const unsigned threads = DIV_ROUND_UP(group_size, simd_size);
 
 
-   if (stage_dirty & IRIS_STAGE_DIRTY_CS) {
+   if ((stage_dirty & IRIS_STAGE_DIRTY_CS) ||
+       cs_prog_data->local_size[0] == 0 /* Variable local group size */) {
       /* The MEDIA_VFE_STATE documentation for Gfx8+ says:
        *
        *   "A stalling PIPE_CONTROL is required before MEDIA_VFE_STATE unless