diff --git a/right/hid_generic.c b/right/hid_generic.c
index 0a2f10f..2a1faea 100644
--- a/right/hid_generic.c
+++ b/right/hid_generic.c
@@ -62,11 +62,12 @@ usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void *
 
     return error;
 }
+
 usb_status_t UsbGenericHidSetConfiguration(class_handle_t handle, uint8_t configuration)
 {
     if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) {
         return USB_DeviceHidRecv(
-                UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_OUT_ID,
+            UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_OUT_ID,
             (uint8_t *)&UsbGenericHidDevice.buffer[UsbGenericHidDevice.bufferIndex][0],
             USB_GENERIC_HID_OUT_BUFFER_LENGTH);
     }
@@ -77,13 +78,10 @@ usb_status_t UsbGenericHidSetInterface(class_handle_t handle, uint8_t interface,
 {
     if (USB_KEYBOARD_INTERFACE_INDEX == interface) {
         UsbCompositeDevice.currentInterfaceAlternateSetting[interface] = alternateSetting;
-        if (alternateSetting == 0U)
-        {
-            return USB_DeviceHidRecv(
-                    UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_OUT_ID,
-                (uint8_t *)&UsbGenericHidDevice.buffer[UsbGenericHidDevice.bufferIndex][0],
-                USB_GENERIC_HID_OUT_BUFFER_LENGTH);
-        }
+        return USB_DeviceHidRecv(
+            UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_OUT_ID,
+            (uint8_t *)&UsbGenericHidDevice.buffer[UsbGenericHidDevice.bufferIndex][0],
+            USB_GENERIC_HID_OUT_BUFFER_LENGTH);
     }
     return kStatus_USB_Error;
 }