diff --git a/.pick_status.json b/.pick_status.json
index 0fe4e0adc95..7c65e4abb4f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -445,7 +445,7 @@
         "description": "ac/nir/ps: fix null export write mask miss set to 0xf",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c182154456288dbab23e87dbc5fc1962984caa92"
     },
diff --git a/src/amd/common/ac_nir_lower_ps.c b/src/amd/common/ac_nir_lower_ps.c
index 53dbe486b11..8b0c533b0da 100644
--- a/src/amd/common/ac_nir_lower_ps.c
+++ b/src/amd/common/ac_nir_lower_ps.c
@@ -489,9 +489,12 @@ emit_ps_null_export(nir_builder *b, lower_ps_state *s)
    unsigned target = s->options->gfx_level >= GFX11 ?
       V_008DFC_SQ_EXP_MRT : V_008DFC_SQ_EXP_NULL;
 
-   nir_export_amd(b, nir_ssa_undef(b, 4, 32),
-                  .base = target,
-                  .flags = AC_EXP_FLAG_VALID_MASK | AC_EXP_FLAG_DONE);
+   nir_intrinsic_instr *intrin =
+      nir_export_amd(b, nir_ssa_undef(b, 4, 32),
+                     .base = target,
+                     .flags = AC_EXP_FLAG_VALID_MASK | AC_EXP_FLAG_DONE);
+   /* To avoid builder set write mask to 0xf. */
+   nir_intrinsic_set_write_mask(intrin, 0);
 }
 
 static void