diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.c b/right/src/usb_interfaces/usb_interface_basic_keyboard.c
index afebbd5..90a2108 100644
--- a/right/src/usb_interfaces/usb_interface_basic_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_basic_keyboard.c
@@ -28,14 +28,12 @@ usb_status_t UsbBasicKeyboardAction(void)
         return kStatus_USB_Error; // The device is not attached
     }
 
-    SwitchActiveUsbBasicKeyboardReport(); // Switch the active report
     usb_status_t usb_status = USB_DeviceHidSend(
-            UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX,
-            (uint8_t*)GetInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH);
+        UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX,
+        (uint8_t *)ActiveUsbBasicKeyboardReport, USB_BASIC_KEYBOARD_REPORT_LENGTH);
     if (usb_status == kStatus_USB_Success) {
         UsbBasicKeyboardActionCounter++;
-    } else {
-        SwitchActiveUsbBasicKeyboardReport(); // Switch back, as the command failed
+        SwitchActiveUsbBasicKeyboardReport();
     }
     return usb_status;
 }
diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.c b/right/src/usb_interfaces/usb_interface_media_keyboard.c
index 145377e..e83e081 100644
--- a/right/src/usb_interfaces/usb_interface_media_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_media_keyboard.c
@@ -26,14 +26,12 @@ usb_status_t UsbMediaKeyboardAction(void)
         return kStatus_USB_Error; // The device is not attached
     }
 
-    SwitchActiveUsbMediaKeyboardReport(); // Switch the active report
     usb_status_t usb_status = USB_DeviceHidSend(
-            UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX,
-            (uint8_t*)GetInactiveUsbMediaKeyboardReport(), USB_MEDIA_KEYBOARD_REPORT_LENGTH);
+        UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX,
+        (uint8_t *)ActiveUsbMediaKeyboardReport, USB_MEDIA_KEYBOARD_REPORT_LENGTH);
     if (usb_status == kStatus_USB_Success) {
         UsbMediaKeyboardActionCounter++;
-    } else {
-        SwitchActiveUsbMediaKeyboardReport(); // Switch back, as the command failed
+        SwitchActiveUsbMediaKeyboardReport();
     }
     return usb_status;
 }
diff --git a/right/src/usb_interfaces/usb_interface_mouse.c b/right/src/usb_interfaces/usb_interface_mouse.c
index 94afe11..6d69a99 100644
--- a/right/src/usb_interfaces/usb_interface_mouse.c
+++ b/right/src/usb_interfaces/usb_interface_mouse.c
@@ -26,14 +26,12 @@ usb_status_t UsbMouseAction(void)
         return kStatus_USB_Error; // The device is not attached
     }
 
-    SwitchActiveUsbMouseReport(); // Switch the active report
     usb_status_t usb_status = USB_DeviceHidSend(
-            UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
-            (uint8_t*)GetInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH);
+        UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
+        (uint8_t *)ActiveUsbMouseReport, USB_MOUSE_REPORT_LENGTH);
     if (usb_status == kStatus_USB_Success) {
         UsbMouseActionCounter++;
-    } else {
-        SwitchActiveUsbMouseReport(); // Switch back, as the command failed
+        SwitchActiveUsbMouseReport();
     }
     return usb_status;
 }
diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.c b/right/src/usb_interfaces/usb_interface_system_keyboard.c
index f3d1415..c8e55eb 100644
--- a/right/src/usb_interfaces/usb_interface_system_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_system_keyboard.c
@@ -26,14 +26,12 @@ usb_status_t UsbSystemKeyboardAction(void)
         return kStatus_USB_Error; // The device is not attached
     }
 
-    SwitchActiveUsbSystemKeyboardReport(); // Switch the active report
     usb_status_t usb_status = USB_DeviceHidSend(
-            UsbCompositeDevice.systemKeyboardHandle, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX,
-            (uint8_t*)GetInactiveUsbSystemKeyboardReport(), USB_SYSTEM_KEYBOARD_REPORT_LENGTH);
+        UsbCompositeDevice.systemKeyboardHandle, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX,
+        (uint8_t *)ActiveUsbSystemKeyboardReport, USB_SYSTEM_KEYBOARD_REPORT_LENGTH);
     if (usb_status == kStatus_USB_Success) {
         UsbSystemKeyboardActionCounter++;
-    } else {
-        SwitchActiveUsbSystemKeyboardReport(); // Switch back, as the command failed
+        SwitchActiveUsbSystemKeyboardReport();
     }
     return usb_status;
 }