diff --git a/src/add-ons/kernel/bus_managers/usb/Pipe.cpp b/src/add-ons/kernel/bus_managers/usb/Pipe.cpp
index 3362e8bbf7..6e00d8db47 100644
--- a/src/add-ons/kernel/bus_managers/usb/Pipe.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/Pipe.cpp
@@ -21,9 +21,10 @@ Pipe::Pipe(Object *parent)
 
 Pipe::~Pipe()
 {
-	PutUSBID();
-
+	PutUSBID(false);
 	Pipe::CancelQueuedTransfers(true);
+	WaitForIdle();
+
 	GetBusManager()->NotifyPipeChange(this, USB_CHANGE_DESTROYED);
 }