diff --git a/.pick_status.json b/.pick_status.json
index 7533396aef0..c52a0bc8fd7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -490,7 +490,7 @@
         "description": "intel/nir: fixup preserved metadata in rayquery lowering",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c78be5da300ae386a12b91a22efb064335e2043a"
     },
diff --git a/src/intel/compiler/brw_nir_lower_ray_queries.c b/src/intel/compiler/brw_nir_lower_ray_queries.c
index 7cee1d6e3d3..7ce34dfdcd3 100644
--- a/src/intel/compiler/brw_nir_lower_ray_queries.c
+++ b/src/intel/compiler/brw_nir_lower_ray_queries.c
@@ -550,6 +550,8 @@ brw_nir_lower_ray_queries(nir_shader *shader,
       nir_remove_dead_variables(shader,
                                 nir_var_shader_temp | nir_var_function_temp,
                                 NULL);
+
+      nir_metadata_preserve(impl, nir_metadata_none);
    }
 
    ralloc_free(state.queries);