diff --git a/Marlin/src/HAL/HAL_STM32/HAL.cpp b/Marlin/src/HAL/HAL_STM32/HAL.cpp
index addef3a85d86cf1cfa404ebc3dbe859bae1b8ed7..edc161a5d3875774ecf5c5b20ce5235045b845d1 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.cpp
+++ b/Marlin/src/HAL/HAL_STM32/HAL.cpp
@@ -49,7 +49,7 @@ uint16_t HAL_adc_result;
 // ------------------------
 
 // Needed for DELAY_NS() / DELAY_US() on CORTEX-M7
-#if (defined(__arm__) || defined(__thumb__)) && WITHIN(__CORTEX_M, 3, 7)
+#if (defined(__arm__) || defined(__thumb__)) && __CORTEX_M == 7
   // HAL pre-initialization task
   // Force the preinit function to run between the premain() and main() function
   // of the STM32 arduino core
diff --git a/Marlin/src/HAL/shared/Delay.h b/Marlin/src/HAL/shared/Delay.h
index 4433134291ef66c5f1a0285a22bb5a4aa55ba028..b1dafbb0f5d615a504afbb88283fa3dda55dd8a9 100644
--- a/Marlin/src/HAL/shared/Delay.h
+++ b/Marlin/src/HAL/shared/Delay.h
@@ -34,7 +34,7 @@
 
 #if defined(__arm__) || defined(__thumb__)
 
-  #if WITHIN(__CORTEX_M, 3, 7)
+  #if __CORTEX_M == 7
 
     // Cortex-M3 through M7 can use the cycle counter of the DWT unit
     // http://www.anthonyvh.com/2017/05/18/cortex_m-cycle_counter/