diff --git a/src/flutter.rs b/src/flutter.rs
index 41e892bd2..1c9aa8bc9 100644
--- a/src/flutter.rs
+++ b/src/flutter.rs
@@ -179,7 +179,6 @@ impl Session {
     /// Close the session.
     pub fn close(&self) {
         self.send(Data::Close);
-        let _ = SESSIONS.write().unwrap().remove(&self.id);
     }
 
     /// Reconnect to the current session.
diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs
index ee1e4086b..22243ca79 100644
--- a/src/flutter_ffi.rs
+++ b/src/flutter_ffi.rs
@@ -133,6 +133,7 @@ pub fn session_close(id: String) {
     if let Some(session) = SESSIONS.read().unwrap().get(&id) {
         session.close();
     }
+    let _ = SESSIONS.write().unwrap().remove(&id);
 }
 
 pub fn session_refresh(id: String) {