diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index acb67c7ba23044bb4d729790dd0886a05af77ec3..aadf4c4b62d9192ad8081bc1bd2c79365eca0303 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -573,6 +573,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
             for (int i = this.messages.size() - 1; i >= 0; --i) {
                 final Message message = messages.get(i);
                 if (reactor == null && message.getStatus() < Message.STATUS_SEND) continue;
+                if (reactor != null && message.getCounterpart() == null) continue;
                 if (reactor != null && !(message.getCounterpart().equals(reactor) || message.getCounterpart().asBareJid().equals(reactor))) continue;
 
                 final Element r = message.getReactions();