diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index c3f87557655d0c71d8dc4d8ca59084985fe3dd65..e17625dd5f511d5952cf175b271f026e57c9c4b5 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -294,7 +294,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             fileSize = null;
             error = message.getStatus() == Message.STATUS_SEND_FAILED;
         }
-        if (type == SENT) {
+        if (type == SENT && viewHolder.indicatorReceived != null) {
             final @DrawableRes Integer receivedIndicator =
                     getMessageStatusAsDrawable(message, mergedStatus);
             if (receivedIndicator == null) {