diff --git a/src/backend/matrix_client.py b/src/backend/matrix_client.py
index f2b0bdc6..5fab97e5 100644
--- a/src/backend/matrix_client.py
+++ b/src/backend/matrix_client.py
@@ -1180,8 +1180,9 @@ class MatrixClient(nio.AsyncClient):
 
         try:
             await super().room_leave(room_id)
-        except MatrixNotFound:  # already left
-            pass
+        except MatrixError as e:  # room was already left
+            if e.http_code != 404:
+                raise
 
         await super().room_forget(room_id)