diff --git a/lapce-rpc/src/proxy.rs b/lapce-rpc/src/proxy.rs
index 098d680c..597cb667 100644
--- a/lapce-rpc/src/proxy.rs
+++ b/lapce-rpc/src/proxy.rs
@@ -385,7 +385,8 @@ pub fn handle_response(
         id: RequestId,
         result: Result<ProxyResponse, RpcError>,
     ) {
-        if let Some(handler) = self.pending.lock().remove(&id) {
+        let handler = { self.pending.lock().remove(&id) };
+        if let Some(handler) = handler {
             handler.invoke(result);
         }
     }