diff --git a/nvim-core/src/lib.rs b/nvim-core/src/lib.rs
index 57d5bfe..b8c7cad 100644
--- a/nvim-core/src/lib.rs
+++ b/nvim-core/src/lib.rs
@@ -177,7 +177,7 @@ async fn get_nvim_connection() -> Result<mpsc::Sender<NvimRequest>, String> {
 
             pending_clone
                 .lock()
-                .unwrap()
+                .unwrap_or_else(|e| e.into_inner())
                 .insert(req.msgid, req.reply);
 
             if write_half.write_all(&buf).await.is_err() {
@@ -271,7 +271,7 @@ async fn get_nvim_connection() -> Result<mpsc::Sender<NvimRequest>, String> {
             }
             pending_clone3
                 .lock()
-                .unwrap()
+                .unwrap_or_else(|e| e.into_inner())
                 .retain(|_, sender| !sender.is_closed());
         }
     });