diff --git a/app/src/main/java/im/conversations/android/ui/adapter/MessageAdapter.java b/app/src/main/java/im/conversations/android/ui/adapter/MessageAdapter.java
index ca87c12c8..e17e149ff 100644
--- a/app/src/main/java/im/conversations/android/ui/adapter/MessageAdapter.java
+++ b/app/src/main/java/im/conversations/android/ui/adapter/MessageAdapter.java
@@ -93,7 +93,6 @@ public class MessageAdapter
         if (holder instanceof MessageReceivedViewHolder messageReceivedViewHolder) {
             final var addressWithName = message.getAddressWithName();
             final var avatar = message.getAvatar();
-            messageReceivedViewHolder.binding.avatar.setVisibility(View.VISIBLE);
             if (avatar != null) {
                 AvatarFetcher.fetchInto(messageReceivedViewHolder.binding.avatar, avatar);
             } else {
diff --git a/app/src/main/res/layout/item_message_received.xml b/app/src/main/res/layout/item_message_received.xml
index c9d165f92..ab98cea31 100644
--- a/app/src/main/res/layout/item_message_received.xml
+++ b/app/src/main/res/layout/item_message_received.xml
@@ -9,6 +9,7 @@
         android:paddingVertical="6dp">
 
         <ImageView
+            android:visibility="@{message == null ? View.INVISIBLE : View.VISIBLE}"
             android:id="@+id/avatar"
             android:layout_width="@dimen/avatar_chat_overview_size"
             android:layout_height="@dimen/avatar_chat_overview_size"