diff --git a/src/Keyboardio-LEDEffect-Numlock.cpp b/src/Keyboardio-LEDEffect-Numlock.cpp
index 0b707eb1..6468fd78 100644
--- a/src/Keyboardio-LEDEffect-Numlock.cpp
+++ b/src/Keyboardio-LEDEffect-Numlock.cpp
@@ -18,9 +18,9 @@ LEDNumlock::begin (void) {
 }
 
 void
-LEDNumlock::setup (void) {
+LEDNumlock::init (void) {
     if (!Layer.isOn (numpadIndex)) {
-        LEDControl.next_mode ();
+        LEDControl.next_mode();
     }
 }
 
@@ -42,15 +42,11 @@ LEDNumlock::loopHook (bool postClear) {
     if (!postClear)
         return;
 
-    if (Layer.isOn (numpadIndex)) {
-        if (storedLEDMode != us) {
+    if (!Layer.isOn (numpadIndex)) {
+        if (LEDControl.get_mode () != us)
             storedLEDMode = LEDControl.get_mode ();
-        }
-        LEDControl.set_mode (us);
-    }
-
-    if (!Layer.isOn (numpadIndex) &&
-            LEDControl.get_mode () == us) {
         LEDControl.set_mode (storedLEDMode);
+    } else {
+        LEDControl.set_mode (us);
     }
 }
diff --git a/src/Keyboardio-LEDEffect-Numlock.h b/src/Keyboardio-LEDEffect-Numlock.h
index 14521096..46ea71d7 100644
--- a/src/Keyboardio-LEDEffect-Numlock.h
+++ b/src/Keyboardio-LEDEffect-Numlock.h
@@ -10,7 +10,7 @@ class LEDNumlock : LEDMode {
   virtual void begin (void) final;
 
   virtual void update (void) final;
-  virtual void setup (void) final;
+  virtual void init (void) final;
 
  private:
   static void loopHook (bool postClear);