diff --git a/src/drivers/bus/usb.c b/src/drivers/bus/usb.c
index 085caf23..7574aaa1 100644
--- a/src/drivers/bus/usb.c
+++ b/src/drivers/bus/usb.c
@@ -1779,9 +1779,6 @@ int register_usb_hub ( struct usb_hub *hub ) {
 	 */
 	usb_poll ( bus );
 
-	/* Attach any devices already present */
-	usb_hotplug();
-
 	return 0;
 
 	hub->driver->close ( hub );
@@ -1915,6 +1912,9 @@ int register_usb_bus ( struct usb_bus *bus ) {
 	if ( ( rc = register_usb_hub ( bus->hub ) ) != 0 )
 		goto err_register_hub;
 
+	/* Attach any devices already present */
+	usb_hotplug();
+
 	return 0;
 
 	unregister_usb_hub ( bus->hub );