diff --git a/IGC/Compiler/Optimizer/IntDivConstantReduction.cpp b/IGC/Compiler/Optimizer/IntDivConstantReduction.cpp
index 3133f75a7c57..e2b878508526 100644
--- a/IGC/Compiler/Optimizer/IntDivConstantReduction.cpp
+++ b/IGC/Compiler/Optimizer/IntDivConstantReduction.cpp
@@ -170,8 +170,11 @@ struct IntDivConstantReduction : public FunctionPass
         int shiftAmt = divisor.logBase2();
         Value *result;
         if (isMod) {
-            // X % 2^K = (X & ((1<<K)-1))
-            result = B.CreateAnd(dividend, ((1ull << shiftAmt)-1));
+            if (shiftAmt == bitSize) { // X % MAX_VAL = X
+                result = dividend;
+            } else { // X % 2^K = (X & ((1<<K)-1))
+                result = B.CreateAnd(dividend, ((1ull << shiftAmt)-1));
+            }
         } else {
             result = B.CreateLShr(dividend, shiftAmt);
         }
diff --git a/IGC/Compiler/tests/IntDivConstantReduction/basic.ll b/IGC/Compiler/tests/IntDivConstantReduction/basic.ll
index 380b10e571f7..aefa70a40916 100644
--- a/IGC/Compiler/tests/IntDivConstantReduction/basic.ll
+++ b/IGC/Compiler/tests/IntDivConstantReduction/basic.ll
@@ -135,17 +135,6 @@ define spir_kernel void @test_sdiv_max(i32 %src1) {
   ret void
 }
 
-define spir_kernel void @test_rem_pow_of_2(i32 %src1) {
-; CHECK-LABEL: @test_rem_pow_of_2(
-; CHECK-NEXT:    [[TMP1:%.*]] = and i32 [[SRC1:%.*]], 2147483647
-; CHECK-NEXT:    call void @use.i32(i32 [[TMP1]])
-; CHECK-NEXT:    ret void
-;
-  %1 = urem i32 %src1, 2147483648 ; <- 2^31
-  call void @use.i32(i32 %1)
-  ret void
-}
-
 define spir_kernel void @test_udiv_max(i32 %src1) {
 ; CHECK-LABEL: @test_udiv_max(
 ; CHECK:    [[Q_APPX:%.*]] = call i32 @llvm.genx.GenISA.umulH.i32(i32 %src1, i32 -2147483647)