diff --git a/.pick_status.json b/.pick_status.json
index 6b2c5915e29..1b7d98d67cb 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4964,7 +4964,7 @@
         "description": "nir: add missing divergence handling for ray_query_global_intel",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c
index c3fd1707890..c718d4cfa8e 100644
--- a/src/compiler/nir/nir_divergence_analysis.c
+++ b/src/compiler/nir/nir_divergence_analysis.c
@@ -358,6 +358,7 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state)
    case nir_intrinsic_load_core_max_id_arm:
    case nir_intrinsic_load_warp_max_id_arm:
    case nir_intrinsic_load_tess_config_intel:
+   case nir_intrinsic_load_ray_query_global_intel:
       is_divergent = false;
       break;