diff --git a/mautrix_facebook/portal.py b/mautrix_facebook/portal.py
index fd96b8e7038b07ad4fc429fa38fac1be82822cfe..90a06b5b7ba6be15c895cce9bf18899f53cce2f0 100644
--- a/mautrix_facebook/portal.py
+++ b/mautrix_facebook/portal.py
@@ -463,6 +463,7 @@ class Portal(BasePortal):
             await intent.leave_room(room_id)
         except MatrixError:
             pass
+        DBMessage.delete_all_by_mxid(room_id)
 
     async def unbridge(self) -> None:
         await self.cleanup_room(self.main_intent, self.mxid, "Room unbridged", puppets_only=True)
@@ -470,7 +471,6 @@ class Portal(BasePortal):
 
     async def cleanup_and_delete(self) -> None:
         await self.cleanup_room(self.main_intent, self.mxid)
-        DBMessage.delete_all_by_mxid(self.mxid)
         self.delete()
 
     # endregion