diff --git a/src/Kaleidoscope-NumPad.cpp b/src/Kaleidoscope-NumPad.cpp
index 2d32e666..b621cd50 100644
--- a/src/Kaleidoscope-NumPad.cpp
+++ b/src/Kaleidoscope-NumPad.cpp
@@ -90,12 +90,13 @@ void NumPad_::setKeyboardLEDColors(void) {
 kaleidoscope::EventHandlerResult NumPad_::afterEachCycle() {
   if (!Layer.isOn(numPadLayer)) {
     cleanupNumlockState();
-  } else if (cleanupDone)  {
-    // If it's the first time we're in this loop after toggling the Numpad mode on
-    syncNumlockState(true);
+  } else {
+    if (cleanupDone)  {
+      // If it's the first time we're in this loop after toggling the Numpad mode on
+      syncNumlockState(true);
+      cleanupDone = false;
+    }
     setKeyboardLEDColors();
-    cleanupDone = false;
-
   }
   return kaleidoscope::EventHandlerResult::OK;
 }