diff --git a/.pick_status.json b/.pick_status.json
index 04ae4edfa1b..105981ef7b0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -778,7 +778,7 @@
         "description": "iris: Add missing untyped data port flush on PIPELINE_SELECT",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "172e0b0ebffa02fa86aa6a1915979fb4de9460bb"
     },
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 0f7e5169a2b..1f381e4e860 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -657,6 +657,8 @@ emit_pipeline_select(struct iris_batch *batch, uint32_t pipeline)
    if (pipeline == GPGPU) {
       flags |= PIPE_CONTROL_RENDER_TARGET_FLUSH |
                PIPE_CONTROL_DEPTH_CACHE_FLUSH;
+   } else {
+      flags |= PIPE_CONTROL_UNTYPED_DATAPORT_CACHE_FLUSH;
    }
    iris_emit_pipe_control_flush(batch, "PIPELINE_SELECT flush", flags);
 #else