diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index acfe0c53..5ece18a6 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -918,6 +918,8 @@ int main(void) {
 	enable_1v8_power();
 	cpu_clock_init();
 
+        usb_queue_init();
+        usb_set_configuration_changed_cb(usb_configuration_changed);
 	usb_peripheral_reset();
 	
 	usb_device_init(0, &usb_device);