diff --git a/right/src/main.c b/right/src/main.c
index 531dd02..8ba0060 100644
--- a/right/src/main.c
+++ b/right/src/main.c
@@ -28,10 +28,6 @@ void updateUsbReports(void)
     KeyMatrix_Scan(&KeyMatrix);
 #endif
 
-    for (uint8_t keyId=0; keyId < KEYBOARD_MATRIX_KEY_COUNT; keyId++) {
-        KeyStates[SlotId_RightKeyboardHalf][keyId].current = KeyMatrix.keyStates[keyId];
-    }
-
     ResetActiveUsbBasicKeyboardReport();
     ResetActiveUsbMediaKeyboardReport();
     ResetActiveUsbSystemKeyboardReport();
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index 4dfa536..0077b19 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -10,6 +10,7 @@
 #include "led_pwm.h"
 #include "macros.h"
 #include "key_states.h"
+#include "key_matrix_instance.h"
 
 static uint8_t mouseWheelDivisorCounter = 0;
 static uint8_t mouseSpeedAccelDivisorCounter = 0;
@@ -98,6 +99,10 @@ void UpdateActiveUsbReports(void)
     static uint8_t previousModifiers = 0;
     uint8_t activeLayer;
 
+    for (uint8_t keyId=0; keyId < KEYBOARD_MATRIX_KEY_COUNT; keyId++) {
+        KeyStates[SlotId_RightKeyboardHalf][keyId].current = KeyMatrix.keyStates[keyId];
+    }
+
     if (MacroPlaying) {
         Macros_ContinueMacro();
         memcpy(&ActiveUsbMouseReport, &MacroMouseReport, sizeof MacroMouseReport);