diff --git a/.pick_status.json b/.pick_status.json
index 626573fae41..f01d1cbe33d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -24,7 +24,7 @@
         "description": "intel/nir: only consider ray query variables in lowering",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/intel/compiler/brw_nir_lower_ray_queries.c b/src/intel/compiler/brw_nir_lower_ray_queries.c
index bcade17e803..844b90da47b 100644
--- a/src/intel/compiler/brw_nir_lower_ray_queries.c
+++ b/src/intel/compiler/brw_nir_lower_ray_queries.c
@@ -543,8 +543,11 @@ brw_nir_lower_ray_queries(nir_shader *shader,
    };
 
    /* Map all query variable to internal type variables */
-   nir_foreach_function_temp_variable(var, state.impl)
+   nir_foreach_function_temp_variable(var, state.impl) {
+      if (!var->data.ray_query)
+         continue;
       register_opaque_var(var, &state);
+   }
    hash_table_foreach(state.queries, entry)
       create_internal_var(entry->data, &state);