diff --git a/src/coreclr/jit/switchrecognition.cpp b/src/coreclr/jit/switchrecognition.cpp
index 1b618be89ff231..be9d109456827f 100644
--- a/src/coreclr/jit/switchrecognition.cpp
+++ b/src/coreclr/jit/switchrecognition.cpp
@@ -354,7 +354,7 @@ bool Compiler::optSwitchDetectAndConvert(BasicBlock* firstBlock, bool testingFor
 //    testsCount - Number of conditional blocks in the chain
 //    testValues - Array of constants that are tested against the variable
 //    falseLikelihood - Likelihood of control flow reaching the false block
-//    nodeToTest - Variable node that is tested against the constants
+//    switchValue - Variable node that is tested against the constants
 //    testingForConversion - Test if its likely a switch conversion will happen.
 //    Used to prevent a pessimization when optimizing for conditional chaining.
 //    Done in this function to prevent maintaining the check in two places.
@@ -367,12 +367,12 @@ bool Compiler::optSwitchConvert(BasicBlock* firstBlock,
                                 int         testsCount,
                                 ssize_t*    testValues,
                                 weight_t    falseLikelihood,
-                                GenTree*    nodeToTest,
+                                GenTree*    switchValue,
                                 bool        testingForConversion,
                                 BitVec*     ccmpVec)
 {
     assert(firstBlock->KindIs(BBJ_COND));
-    assert(!varTypeIsSmall(nodeToTest));
+    assert(!varTypeIsSmall(switchValue));
 
     if (testingForConversion && (testsCount < CONVERT_SWITCH_TO_CCMP_MIN_TEST))
     {
@@ -424,8 +424,18 @@ bool Compiler::optSwitchConvert(BasicBlock* firstBlock,
         return false;
     }
 
-    // if MaxValue is less than SWITCH_MAX_DISTANCE then don't bother with SUB(val, minValue)
-    if (maxValue <= SWITCH_MAX_DISTANCE)
+    // Normalize switch whenever it's a requirement to fit the table or as an optimization to collapse into range check
+    bool doesntFitTable = maxValue > SWITCH_MAX_DISTANCE;
+    bool continousRange = testsCount == (maxValue - minValue + 1);
+    if (doesntFitTable || continousRange)
+    {
+        if (minValue != 0)
+        {
+            switchValue = gtNewOperNode(GT_SUB, switchValue->TypeGet(), switchValue,
+                                        gtNewIconNode(minValue, switchValue->TypeGet()));
+        }
+    }
+    else
     {
         minValue = 0;
     }
@@ -478,14 +488,6 @@ bool Compiler::optSwitchConvert(BasicBlock* firstBlock,
     firstBlock->bbCodeOffsEnd = lastBlock->bbCodeOffsEnd;
     firstBlock->lastStmt()->GetRootNode()->ChangeOper(GT_SWITCH);
 
-    // The root node is now SUB(nodeToTest, minValue) if minValue != 0
-    GenTree* switchValue = nodeToTest;
-    if (minValue != 0)
-    {
-        switchValue =
-            gtNewOperNode(GT_SUB, nodeToTest->TypeGet(), switchValue, gtNewIconNode(minValue, nodeToTest->TypeGet()));
-    }
-
     firstBlock->lastStmt()->GetRootNode()->AsOp()->gtOp1 = switchValue;
     gtSetStmtInfo(firstBlock->lastStmt());
     fgSetStmtSeq(firstBlock->lastStmt());