diff --git a/right/src/init_peripherals.c b/right/src/init_peripherals.c
index e45afc7..506e223 100644
--- a/right/src/init_peripherals.c
+++ b/right/src/init_peripherals.c
@@ -16,6 +16,7 @@
 #include "usb_api.h"
 #include "slave_scheduler.h"
 #include "bootloader/wormhole.h"
+#include "usb_composite_device.h"
 
 bool IsBusPalOn;
 volatile uint32_t I2cMainBusRequestedBaudRateBps = I2C_MAIN_BUS_NORMAL_BAUD_RATE;
@@ -63,13 +64,13 @@ static void initBusPalState(void) {
 
 static void initInterruptPriorities(void)
 {
-    NVIC_SetPriority(PIT_I2C_WATCHDOG_IRQ_ID,  1);
-    NVIC_SetPriority(I2C_EEPROM_BUS_IRQ_ID,    0);
+    NVIC_SetPriority(PIT_I2C_WATCHDOG_IRQ_ID,  2);
+    NVIC_SetPriority(I2C_EEPROM_BUS_IRQ_ID,    1);
     NVIC_SetPriority(PIT_TIMER_IRQ_ID,         3);
     NVIC_SetPriority(PIT_KEY_SCANNER_IRQ_ID,   4);
     NVIC_SetPriority(PIT_KEY_DEBOUNCER_IRQ_ID, 4);
     NVIC_SetPriority(I2C_MAIN_BUS_IRQ_ID,      4);
-    NVIC_SetPriority(USB_IRQ_ID,               4);
+    NVIC_SetPriority(USB_IRQ_ID,               USB_DEVICE_INTERRUPT_PRIORITY);
 }
 
 static void delay(void)
diff --git a/right/src/usb_composite_device.h b/right/src/usb_composite_device.h
index 7c35485..d2a8a31 100644
--- a/right/src/usb_composite_device.h
+++ b/right/src/usb_composite_device.h
@@ -10,7 +10,7 @@
 // Macros:
 
     #define CONTROLLER_ID kUSB_ControllerKhci0
-    #define USB_DEVICE_INTERRUPT_PRIORITY 3
+    #define USB_DEVICE_INTERRUPT_PRIORITY 0
 
 // Typedefs: