diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index 4f1bb11c6a..4136077992 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -571,9 +571,6 @@ void rgblight_show_solid_color(uint8_t r, uint8_t g, uint8_t b) {
 void rgblight_task(void) {
 
   if (rgblight_timer_enabled) {
-
-    if (momentum_enabled()) momentum_decay_task();    
-
     // mode = 1, static light, do nothing here
     if (rgblight_config.mode >= 2 && rgblight_config.mode <= 5) {
       // mode = 2 to 5, breathing mode
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index cb918d3dce..b15c7a76c8 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -1074,6 +1074,8 @@ int main(void)
         MIDI_Device_USBTask(&USB_MIDI_Interface);
 #endif
 
+    if (momentum_enabled()) momentum_decay_task();    
+
 #if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE)
         rgblight_task();
 #endif