diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index d59b4d9a4600..843b8ab806f9 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -470,7 +470,7 @@
 
 // Enable this feature if all enabled endstop pins are interrupt-capable.
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.
-//#define ENDSTOP_INTERRUPTS_FEATURE
+#define ENDSTOP_INTERRUPTS_FEATURE
 
 //=============================================================================
 //============================== Movement Settings ============================
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 90c8471495b9..110d8a151890 100755
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -241,7 +241,7 @@
 
 // If you want endstops to stay on (by default) even when not homing
 // enable this option. Override at any time with M120, M121.
-//#define ENDSTOPS_ALWAYS_ON_DEFAULT
+#define ENDSTOPS_ALWAYS_ON_DEFAULT
 
 // @section extras