diff --git a/firmware/usb.c b/firmware/usb.c
index 8d61f2e60c..298627c4a5 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -675,8 +675,6 @@ void usb_acknowledge(long id)
 
 void usb_init(void)
 {
-    usb_init_device();
-
 #ifdef USB_FULL_INIT
     usb_enable(false);
 
@@ -690,6 +688,8 @@ void usb_init(void)
     tick_add_task(usb_tick);
 #endif
 #endif /* USB_FULL_INIT */
+
+    usb_init_device();
 }
 
 void usb_wait_for_disconnect(struct event_queue *q)