diff --git a/packages/desktop/src/components/Terminal.tsx b/packages/desktop/src/components/Terminal.tsx
index 47d20ab..db71661 100644
--- a/packages/desktop/src/components/Terminal.tsx
+++ b/packages/desktop/src/components/Terminal.tsx
@@ -858,8 +858,15 @@ function ConversationDetails() {
   useEffect(() => {
     joinConversation(selectedConversation.id, user.uid);
 
+    const handleCloseWindow = (event: BeforeUnloadEvent) => {
+      leaveConversation(selectedConversation.id, user.uid);
+    };
+
+    window.addEventListener('beforeunload', handleCloseWindow);
+
     return () => {
       leaveConversation(selectedConversation.id, user.uid);
+      window.removeEventListener('beforeunload', handleCloseWindow);
     };
   }, [selectedConversation.id, user.uid]);