diff --git a/NextcloudTalk/NCRoom.m b/NextcloudTalk/NCRoom.m
index 0a42bafc6..06fb14ccf 100644
--- a/NextcloudTalk/NCRoom.m
+++ b/NextcloudTalk/NCRoom.m
@@ -133,7 +133,7 @@ + (instancetype)roomWithDictionary:(NSDictionary *)roomDict
     }
 
     // Last message proxied (only for Federated rooms)
-    if (room.remoteToken.length > 0 && room.remoteServer.length > 0 && room.remoteAccessToken > 0) {
+    if ([room isFederated]) {
         id lastMessageProxied = [roomDict objectForKey:@"lastMessage"];
         if ([lastMessageProxied isKindOfClass:[NSDictionary class]]) {
             NSError *error;