diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index e692787a3..fe6b8a1fb 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -761,7 +761,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 						packet.getType());
 				mXmppConnectionService.sendMessagePacket(account, receipt);
 			}
-		} else { //just catchup??
+		} else if (query.isCatchup()) {
 			if (request) {
 				query.addPendingReceiptRequest(new ReceiptRequest(packet.getFrom(), packet.getId()));
 			}