diff --git a/src/coreclr/jit/lsra.h b/src/coreclr/jit/lsra.h
index 249d60e051dcf..62186a3d976ce 100644
--- a/src/coreclr/jit/lsra.h
+++ b/src/coreclr/jit/lsra.h
@@ -1725,13 +1725,15 @@ class LinearScan : public LinearScanInterface
 #endif
     PhasedVar<SingleTypeRegSet>* availableRegs[TYP_COUNT];
 
-#if defined(TARGET_XARCH)
-#define allAvailableRegs regMaskTP(availableIntRegs | availableFloatRegs | availableMaskRegs)
-#elif defined(TARGET_ARM64)
+#if defined(TARGET_XARCH) || defined(TARGET_ARM64)
+#ifdef HAS_MORE_THAN_64_REGISTERS
 #define allAvailableRegs regMaskTP(availableIntRegs | availableFloatRegs, availableMaskRegs)
 #else
+#define allAvailableRegs regMaskTP(availableIntRegs | availableFloatRegs | availableMaskRegs)
+#endif // HAS_MORE_THAN_64_REGISTERS
+#else
 #define allAvailableRegs regMaskTP(availableIntRegs | availableFloatRegs)
-#endif
+#endif // defined(TARGET_XARCH) || defined(TARGET_ARM64)
 
     // Register mask of argument registers currently occupied because we saw a
     // PUTARG_REG node. Tracked between the PUTARG_REG and its corresponding
diff --git a/src/coreclr/jit/target.h b/src/coreclr/jit/target.h
index 64a0a6864bbb1..d04f93acafaa4 100644
--- a/src/coreclr/jit/target.h
+++ b/src/coreclr/jit/target.h
@@ -230,7 +230,7 @@ typedef uint64_t regMaskSmall;
 #endif
 
 #ifdef TARGET_ARM64
-#define HAS_MORE_THAN_64_REGISTERS 1
+// #define HAS_MORE_THAN_64_REGISTERS 1
 #endif // TARGET_ARM64
 
 #ifdef HAS_MORE_THAN_64_REGISTERS