Index: uspace/lib/usbdev/src/hub.c
===================================================================
--- uspace/lib/usbdev/src/hub.c	(revision 27736cf9e91e5f4fa53f888bb312dd0a6cb7fffc)
+++ uspace/lib/usbdev/src/hub.c	(revision bbd0969458d8c11b502df1442625aebe12fba28e)
@@ -379,7 +379,4 @@
 	 */
 leave_release_default_address:
-	if (usb_pipe_unregister(&ctrl_pipe, &hc_conn) != EOK)
-		usb_log_warning("%s: Failed to unregister default pipe.\n",
-		    __FUNCTION__);
 	usb_hc_unregister_device(&hc_conn, USB_ADDRESS_DEFAULT);
 
@@ -388,4 +385,8 @@
 		usb_log_warning("%s: Failed to unregister device.\n",
 		    __FUNCTION__);
+	/* This might be either 0:0 or dev_addr:0 */
+	if (usb_pipe_unregister(&ctrl_pipe, &hc_conn) != EOK)
+		usb_log_warning("%s: Failed to unregister default pipe.\n",
+		    __FUNCTION__);
 
 close_connection: