diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index a1d9ff0df..865a8bea6 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -1368,6 +1368,9 @@ class FFI {
       // Preserved for the rgba data.
       await for (final message in stream) {
         if (message is EventToUI_Event) {
+          if (message.field0 == "close") {
+            break;
+          }
           try {
             Map<String, dynamic> event = json.decode(message.field0);
             await cb(event);
diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs
index 0e307abe3..3f9940854 100644
--- a/src/flutter_ffi.rs
+++ b/src/flutter_ffi.rs
@@ -132,6 +132,9 @@ pub fn session_login(id: String, password: String, remember: bool) {
 
 pub fn session_close(id: String) {
     if let Some(session) = SESSIONS.read().unwrap().get(&id) {
+        if let Some(stream) = &*session.event_stream.read().unwrap() {
+            stream.add(EventToUI::Event("close".to_owned()));
+        }
         session.close();
     }
     let _ = SESSIONS.write().unwrap().remove(&id);