diff --git a/TODO.md b/TODO.md
index 19350ee5..5f1a65ab 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,3 @@
-- room doesn't change category when accept/reject invite
-
 - "rejoin" leftbanner button if room is public
 - daybreak color
 - html links color
diff --git a/src/qml/Chat/Banners/InviteBanner.qml b/src/qml/Chat/Banners/InviteBanner.qml
index e38b13dc..dbb4d069 100644
--- a/src/qml/Chat/Banners/InviteBanner.qml
+++ b/src/qml/Chat/Banners/InviteBanner.qml
@@ -13,7 +13,7 @@ Banner {
     avatar.userId: inviterId
 
     labelText: qsTr("%1 invited you to join the room.").arg(
-        inviterId ?
+        inviterId && inviterInfo ?
         Utils.coloredNameHtml(inviterInfo.displayName, inviterId) :
         qsTr("Someone")
     )
diff --git a/src/qml/Chat/Banners/LeftBanner.qml b/src/qml/Chat/Banners/LeftBanner.qml
index 6aa2858a..d0303e19 100644
--- a/src/qml/Chat/Banners/LeftBanner.qml
+++ b/src/qml/Chat/Banners/LeftBanner.qml
@@ -9,7 +9,7 @@ Banner {
 
     // TODO: avatar func auto
     avatar.userId: userId
-    avatar.imageUrl: users.find(userId).avatarUrl
+    avatar.imageUrl: userInfo ? userInfo.avatarUrl : null
     labelText: qsTr("You are not part of this room anymore.")
 
     buttonModel: [