diff --git a/src/intel/compiler/brw_opt.cpp b/src/intel/compiler/brw_opt.cpp
index 1eb46ebc8f2..52eca022d1f 100644
--- a/src/intel/compiler/brw_opt.cpp
+++ b/src/intel/compiler/brw_opt.cpp
@@ -103,7 +103,9 @@ brw_optimize(brw_shader &s)
       OPT(brw_opt_dead_code_eliminate);
    }
 
-   OPT(brw_lower_subgroup_ops);
+   if (OPT(brw_lower_subgroup_ops))
+      OPT(brw_opt_cmod_propagation);
+
    OPT(brw_lower_csel);
    OPT(brw_lower_simd_width);
    OPT(brw_lower_scalar_fp64_MAD);