diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c9810ae..1d5096d 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -587,7 +587,7 @@
  * (This feature is not required for common micro-switches mounted on PCBs
  * based on the Makerbot design, since they already include the 100nF capacitor.)
  */
-//#define ENDSTOP_NOISE_FILTER
+#define ENDSTOP_NOISE_FILTER
 
 //=============================================================================
 //============================== Movement Settings ============================
diff --git a/Marlin/endstops.cpp b/Marlin/endstops.cpp
index 39fbc80..38662d8 100644
--- a/Marlin/endstops.cpp
+++ b/Marlin/endstops.cpp
@@ -537,7 +537,7 @@ void Endstops::update() {
      */
     static esbits_t old_live_state;
     if (old_live_state != live_state) {
-      endstop_poll_count = 7;
+      endstop_poll_count = 2;
       old_live_state = live_state;
     }
     else if (endstop_poll_count && !--endstop_poll_count)