diff --git a/TODO.md b/TODO.md
index 756bf5bf..a2a8338b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -23,6 +23,9 @@
 
 ## Issues
 
+- Show a proper error when accepting a room invite that has expired or
+  the room doesn't exist anymore (`MatrixNotFound`)
+
 - Replying to one of our own message that's currently only a local echo
   results in a reply to an empty ID
 
diff --git a/src/gui/Pages/Chat/ChatPage.qml b/src/gui/Pages/Chat/ChatPage.qml
index 22cb4a08..19856782 100644
--- a/src/gui/Pages/Chat/ChatPage.qml
+++ b/src/gui/Pages/Chat/ChatPage.qml
@@ -29,7 +29,7 @@ HColumnPage {
 
     Timer {
         interval: 200
-        running: true
+        running: ! chat.roomInfo.inviter_id && ! chat.roomInfo.left
         onTriggered: loadMembersFuture = py.callClientCoro(
             chat.userId,
             "load_all_room_members",