diff --git a/kernel/driver/usb/xhci/src/controller.rs b/kernel/driver/usb/xhci/src/controller.rs
index 31b8a315..09926873 100644
--- a/kernel/driver/usb/xhci/src/controller.rs
+++ b/kernel/driver/usb/xhci/src/controller.rs
@@ -236,7 +236,10 @@ impl Xhci {
         let state = &self.port_states[port];
 
         match state.state.swap(PortState::Disconnected, Ordering::Release) {
-            PortState::Init => todo!(),
+            PortState::Init => {
+                log::warn!("USB device detach received while in init state");
+                Ok(())
+            }
             PortState::Running => {
                 log::info!("Port {}: device detached", port);
                 let address = state