diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 1267ec415..2187617e3 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -307,9 +307,13 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 		synchronized (this.messages) {
 			for (int i = this.messages.size() - 1; i >= 0; --i) {
 				final Message message = messages.get(i);
+				final Jid mcp = message.getCounterpart();
+				if (mcp == null) {
+					continue;
+				}
 				final boolean counterpartMatch = mode == MODE_SINGLE ?
-					counterpart.asBareJid().equals(message.getCounterpart().asBareJid()) :
-					counterpart.equals(message.getCounterpart());
+					counterpart.asBareJid().equals(mcp.asBareJid()) :
+					counterpart.equals(mcp);
 				if (counterpartMatch && ((message.getStatus() == Message.STATUS_RECEIVED) == received)
 						&& (carbon == message.isCarbon() || received)) {
 					final boolean idMatch = id.equals(message.getRemoteMsgId()) || message.remoteMsgIdMatchInEdit(id);