diff --git a/crates/rpc/rpc-builder/src/auth.rs b/crates/rpc/rpc-builder/src/auth.rs
index 0d0a6165ff..0c5a0cbe8e 100644
--- a/crates/rpc/rpc-builder/src/auth.rs
+++ b/crates/rpc/rpc-builder/src/auth.rs
@@ -337,8 +337,15 @@ impl AuthServerHandle {
 
     /// Tell the server to stop without waiting for the server to stop.
     pub fn stop(self) -> Result<(), AlreadyStoppedError> {
-        let Some(handle) = self.handle else { return Ok(()) };
-        handle.stop()
+        if let Some(handle) = self.handle {
+            handle.stop()?;
+        }
+
+        if let Some(ipc_handle) = self.ipc_handle {
+            ipc_handle.stop()?;
+        }
+
+        Ok(())
     }
 
     /// Returns the url to the http server