diff --git a/src/intel/compiler/brw/brw_compiler.c b/src/intel/compiler/brw/brw_compiler.c
index f655094f68f..1799accef35 100644
--- a/src/intel/compiler/brw/brw_compiler.c
+++ b/src/intel/compiler/brw/brw_compiler.c
@@ -195,6 +195,7 @@ brw_compiler_create(void *mem_ctx, const struct intel_device_info *devinfo)
          nir_divergence_single_prim_per_subgroup;
 
    for (int i = 0; i < MESA_ALL_SHADER_STAGES; i++) {
+      bool jay = intel_use_jay(compiler->devinfo, i);
       struct nir_shader_compiler_options *stage_options =
          &compiler->nir_options[i];
       *stage_options = compiler->nir_options[0];
@@ -202,6 +203,8 @@ brw_compiler_create(void *mem_ctx, const struct intel_device_info *devinfo)
       stage_options->unify_interfaces = i < MESA_SHADER_FRAGMENT;
 
       stage_options->force_indirect_unrolling |= brw_nir_no_indirect_mask(i);
+      stage_options->has_find_msb_rev = jay;
+      stage_options->lower_ifind_msb = jay;
    }
 
    /* Build a list of storage format compatible in component bit size &