diff --git a/app/src/renderer/apps/StandaloneChat/StandaloneChatRoom.tsx b/app/src/renderer/apps/StandaloneChat/StandaloneChatRoom.tsx
index 91591d6641..e856f98d83 100644
--- a/app/src/renderer/apps/StandaloneChat/StandaloneChatRoom.tsx
+++ b/app/src/renderer/apps/StandaloneChat/StandaloneChatRoom.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { MouseEvent, useEffect } from 'react';
 import { observer } from 'mobx-react';
 
 import {
@@ -39,6 +39,18 @@ const StandaloneChatRoomPresenter = () => {
   const creatorStr =
     creator.length > 14 ? `${creator.substring(0, 14)}...` : creator;
 
+  const onClickLeaveRoom = (e: MouseEvent) => {
+    e.stopPropagation();
+
+    chatStore.setSubroute('chat');
+    roomsStore.leaveRoom(rid);
+
+    // Delete room if we're the creator or the last person in the room.
+    if (creator === loggedInAccount?.serverId || presentCount === 0) {
+      roomsStore.deleteRoom(rid);
+    }
+  };
+
   return (
     <Flex flex={1} flexDirection="column" width="100%">
       <Flex
@@ -102,16 +114,7 @@ const StandaloneChatRoomPresenter = () => {
               icon="RoomLeave"
               size={22}
               customBg="intent-alert"
-              onClick={(evt) => {
-                evt.stopPropagation();
-                if (creator === loggedInAccount?.serverId) {
-                  roomsStore.deleteRoom(rid);
-                  chatStore.setSubroute('chat');
-                } else {
-                  roomsStore.leaveRoom(rid);
-                  chatStore.setSubroute('chat');
-                }
-              }}
+              onClick={onClickLeaveRoom}
             />
             <CommButton
               icon={isMuted ? 'MicOff' : 'MicOn'}
diff --git a/app/src/renderer/components/StartRoomButton/StartRoomButton.tsx b/app/src/renderer/components/StartRoomButton/StartRoomButton.tsx
index cf090639fb..6393316399 100644
--- a/app/src/renderer/components/StartRoomButton/StartRoomButton.tsx
+++ b/app/src/renderer/components/StartRoomButton/StartRoomButton.tsx
@@ -37,18 +37,21 @@ const StartRoomButtonPresenter = ({ isStandaloneChat }: Props) => {
       // LEAVE OTHER ROOM
       sound.playRoomLeave();
       roomsStore.leaveRoom(roomsStore.currentRoom.rid);
+      // DELETE OTHER ROOM IF EMPTY
+      if (roomsStore.currentRoom?.present.length === 0) {
+        roomsStore.deleteRoom(roomsStore.currentRoom.rid);
+      }
     }
 
     if (existingRoom) {
       if (areWeInRoom) {
-        sound.playRoomLeave();
         // LEAVE ROOM
         sound.playRoomLeave();
         roomsStore.leaveRoom(existingRoom.rid);
         if (subroute === 'room') setSubroute('chat');
 
+        // DELETE ROOM IF EMPTY
         if (existingRoom?.present.length === 0) {
-          // DELETE ROOM
           roomsStore.deleteRoom(existingRoom.rid);
         }
       } else {