diff --git a/lib/shared/sdk/usbboot/usb.js b/lib/shared/sdk/usbboot/usb.js
index 6ae844a9..1b35e123 100644
--- a/lib/shared/sdk/usbboot/usb.js
+++ b/lib/shared/sdk/usbboot/usb.js
@@ -45,6 +45,14 @@ _.each([
   exports[constant] = usb[constant]
 })
 
+/**
+ * @summary The timeout for USB control transfers, in milliseconds
+ * @type {Number}
+ * @constant
+ */
+// In node-usb, 0 means "infinite" timeout
+const USB_CONTROL_TRANSFER_TIMEOUT_MS = 0
+
 /**
  * @summary List the available USB devices
  * @function
@@ -123,6 +131,7 @@ exports.performControlTransfer = (device, options) => {
   }
 
   return Bluebird.fromCallback((callback) => {
+    device.timeout = USB_CONTROL_TRANSFER_TIMEOUT_MS
     device.controlTransfer(
       options.bmRequestType,
       options.bRequest,