diff --git a/cranelift/codegen/src/preopt.peepmatic b/cranelift/codegen/src/preopt.peepmatic
index c0f6d0862e..791b1c30de 100644
--- a/cranelift/codegen/src/preopt.peepmatic
+++ b/cranelift/codegen/src/preopt.peepmatic
@@ -194,5 +194,6 @@
 
 ;; Reminder by a power of two -> bitwise and with decreased by one constant.
 (=> (when (urem_imm $C $x)
-          (is-power-of-two $C))
+          (is-power-of-two $C)
+          (fits-in-native-word $C))
     (band_imm $(isub 1 $C) $x))
diff --git a/cranelift/codegen/src/preopt.serialized b/cranelift/codegen/src/preopt.serialized
index 7ef6d12642..27023cfad2 100644
Binary files a/cranelift/codegen/src/preopt.serialized and b/cranelift/codegen/src/preopt.serialized differ