diff --git a/Makefile b/Makefile
index 02e223f3..f0190626 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ style: ## run code style check on application sources and tests
 
 ## build commands:
 
-build: build_boardloader build_bootloader build_prodtest build_firmware build_unix build_cross ## build all
+build: build_boardloader build_bootloader build_firmware build_prodtest build_unix ## build all
 
 build_boardloader: ## build boardloader
 	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" $(BOARDLOADER_BUILD_DIR)/boardloader.bin
diff --git a/embed/trezorhal/usbd_core.c b/embed/trezorhal/usbd_core.c
index 265cf86c..2f62e497 100644
--- a/embed/trezorhal/usbd_core.c
+++ b/embed/trezorhal/usbd_core.c
@@ -271,6 +271,7 @@ USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)
   switch (pdev->request.bmRequest & USB_REQ_TYPE_MASK)
   {
     case USB_REQ_TYPE_STANDARD:
+    case USB_REQ_TYPE_CLASS:
       switch (pdev->request.bmRequest & USB_REQ_RECIPIENT_MASK)
       {
         case USB_REQ_RECIPIENT_DEVICE:
@@ -288,15 +289,6 @@ USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)
       }
       break;
 
-    case USB_REQ_TYPE_CLASS:
-      if (pdev->dev_state == USBD_STATE_CONFIGURED) {
-        if (pdev->pClass->Setup != NULL)
-            pdev->pClass->Setup(pdev, &pdev->request);
-      } else {
-          USBD_CtlError(pdev, &pdev->request);
-      }
-      break;
-
     case USB_REQ_TYPE_VENDOR:
       if (pdev->dev_state == USBD_STATE_CONFIGURED || pdev->dev_state == USBD_STATE_ADDRESSED) {
         if (pdev->pClass->Setup != NULL)