diff --git a/src/server/frontend_task.rs b/src/server/frontend_task.rs
index f2eade1..57edc45 100644
--- a/src/server/frontend_task.rs
+++ b/src/server/frontend_task.rs
@@ -242,14 +242,11 @@ pub async fn remove_client(
     frontend: &mut FrontendListener,
     client: ClientHandle,
 ) -> Option<ClientHandle> {
-    let Some((client, active)) = server
+    let (client, active) = server
         .client_manager
         .borrow_mut()
         .remove_client(client)
-        .map(|s| (s.client.handle, s.active))
-    else {
-        return None;
-    };
+        .map(|s| (s.client.handle, s.active))?;
 
     if active {
         let _ = capture_notify_tx