diff --git a/.pick_status.json b/.pick_status.json
index 818528efa9b..cf8bea1c6a3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -769,7 +769,7 @@
         "description": "nir/lower_shader_calls: update metadata before validation",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/compiler/nir/nir_lower_shader_calls.c b/src/compiler/nir/nir_lower_shader_calls.c
index d68a4396929..30882d3358a 100644
--- a/src/compiler/nir/nir_lower_shader_calls.c
+++ b/src/compiler/nir/nir_lower_shader_calls.c
@@ -1085,11 +1085,11 @@ lower_resume(nir_shader *shader, int call_idx)
 
    ralloc_free(mem_ctx);
 
+   nir_metadata_preserve(impl, nir_metadata_none);
+
    nir_validate_shader(shader, "after flatten_resume_if_ladder in "
                                "brw_nir_lower_shader_calls");
 
-   nir_metadata_preserve(impl, nir_metadata_none);
-
    return resume_instr;
 }