diff --git a/src/intel/compiler/brw_nir_lower_ray_queries.c b/src/intel/compiler/brw_nir_lower_ray_queries.c
index bb3a13fc2b5..1c58ecd58ff 100644
--- a/src/intel/compiler/brw_nir_lower_ray_queries.c
+++ b/src/intel/compiler/brw_nir_lower_ray_queries.c
@@ -429,7 +429,7 @@ lower_ray_query_intrinsic(nir_builder *b,
          nir_def *geometry_index_dw =
             nir_load_global(b, nir_iadd_imm(b, hit_in.prim_leaf_ptr, 4), 4,
                             1, 32);
-         sysval = nir_iand_imm(b, geometry_index_dw, BITFIELD_MASK(29));
+         sysval = nir_iand_imm(b, geometry_index_dw, BITFIELD_MASK(24));
          break;
       }
 
diff --git a/src/intel/compiler/brw_nir_lower_rt_intrinsics.c b/src/intel/compiler/brw_nir_lower_rt_intrinsics.c
index 1291290acac..bcd6f66b239 100644
--- a/src/intel/compiler/brw_nir_lower_rt_intrinsics.c
+++ b/src/intel/compiler/brw_nir_lower_rt_intrinsics.c
@@ -282,7 +282,7 @@ lower_rt_intrinsics_impl(nir_function_impl *impl,
             nir_def *geometry_index_dw =
                nir_load_global(b, nir_iadd_imm(b, hit_in.prim_leaf_ptr, 4), 4,
                                1, 32);
-            sysval = nir_iand_imm(b, geometry_index_dw, BITFIELD_MASK(29));
+            sysval = nir_iand_imm(b, geometry_index_dw, BITFIELD_MASK(24));
             break;
          }