diff --git a/.pick_status.json b/.pick_status.json
index df57e8c9366..2b4604011a6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3452,7 +3452,7 @@
         "description": "nir_to_tgsi: Fix emitting the sample number for non-array MSAA image access.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "c6d3fd8c21e06086e573be24ef3e28454245845f"
     },
     {
diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c
index b2527a3e70b..ddd6dcdf7da 100644
--- a/src/gallium/auxiliary/nir/nir_to_tgsi.c
+++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c
@@ -1592,7 +1592,7 @@ ntt_emit_image_load_store(struct ntt_compile *c, nir_intrinsic_instr *instr)
       if (dim == GLSL_SAMPLER_DIM_MS) {
          temp = ureg_DECL_temporary(c->ureg);
          ureg_MOV(c->ureg, temp, coord);
-         ureg_MOV(c->ureg, ureg_writemask(temp, 1 << (is_array ? 3 : 2)),
+         ureg_MOV(c->ureg, ureg_writemask(temp, TGSI_WRITEMASK_W),
                   ureg_scalar(ntt_get_src(c, instr->src[2]), TGSI_SWIZZLE_X));
          coord = ureg_src(temp);
       }