diff --git a/.pick_status.json b/.pick_status.json
index c20b922564d..dd92393df80 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2594,7 +2594,7 @@
         "description": "nak: the MS location comes last in TLD, same spot as depth compare in TEX",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "ad01fbdda030d2c5d2dd09f02bbaa7ab3613b7ae",
         "notes": null
diff --git a/src/nouveau/compiler/nak_nir_lower_tex.c b/src/nouveau/compiler/nak_nir_lower_tex.c
index bdbc5c77b66..7129281e488 100644
--- a/src/nouveau/compiler/nak_nir_lower_tex.c
+++ b/src/nouveau/compiler/nak_nir_lower_tex.c
@@ -361,8 +361,6 @@ lower_tex(nir_builder *b, nir_tex_instr *tex, const struct nak_compiler *nak)
 
          if (tex_h != NULL)
             PUSH(src1, tex_h);
-         if (ms_idx != NULL)
-            PUSH(src1, ms_idx);
          if (lod != NULL)
             PUSH(src1, lod);
          if (offset_mode == NAK_NIR_OFFSET_MODE_AOFFI) {
@@ -373,6 +371,8 @@ lower_tex(nir_builder *b, nir_tex_instr *tex, const struct nak_compiler *nak)
          }
          if (z_cmpr != NULL)
             PUSH(src1, z_cmpr);
+         if (ms_idx != NULL)
+            PUSH(src1, ms_idx);
       }
 
       scalar = try_scalarize_tex(tex, nak, src0, &src0_comps, src1, &src1_comps);