diff --git a/.pick_status.json b/.pick_status.json
index 344cb37f54d..474293ae776 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5359,7 +5359,7 @@
         "description": "intel/compiler: adjust [store|load]_task_payload.base too",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c36ae42e4cccc925e5319afe41c4b8ba850730b4"
     },
diff --git a/src/intel/compiler/brw_mesh.cpp b/src/intel/compiler/brw_mesh.cpp
index dfae5ce6370..2d777c37074 100644
--- a/src/intel/compiler/brw_mesh.cpp
+++ b/src/intel/compiler/brw_mesh.cpp
@@ -202,6 +202,10 @@ brw_nir_adjust_task_payload_offsets_instr(struct nir_builder *b,
       nir_ssa_def *offset = nir_ishr_imm(b, offset_src->ssa, 2);
       nir_instr_rewrite_src(&intrin->instr, offset_src, nir_src_for_ssa(offset));
 
+      unsigned base = nir_intrinsic_base(intrin);
+      assert(base % 4 == 0);
+      nir_intrinsic_set_base(intrin, base / 4);
+
       return true;
    }