diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
index e9a130e07..766ed788a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
@@ -285,7 +285,7 @@ public class ChatMessage implements MessageContentType, MessageContentType.Image
             public String getAvatar() {
                 if (getActorType().equals("users")) {
                     return ApiUtils.getUrlForAvatarWithName(getActiveUser().getBaseUrl(), actorId, R.dimen.avatar_size);
-                } else if (getActorType().equals("guests")) {
+                } else {
                     String apiId =
                             NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest);
 
@@ -293,8 +293,6 @@ public class ChatMessage implements MessageContentType, MessageContentType.Image
                         apiId = getActorDisplayName();
                     }
                     return ApiUtils.getUrlForAvatarWithNameForGuests(getActiveUser().getBaseUrl(), apiId, R.dimen.avatar_size);
-                } else {
-                    return null;
                 }
             }
         };