diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 5458ecbfede767c25b6a0de80abcfd97252b91b8..66ec66124e3cda943f8c7a2f1ec90a2dea0d1f94 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -750,7 +750,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 							}
 						} else {
 							final Jid fallback = conversation.getMucOptions().getTrueCounterpart(counterpart);
-							Jid trueJid = getTrueCounterpart(query != null ? mucUserElement : null, fallback);
+							Jid trueJid = getTrueCounterpart((query != null && query.safeToExtractTrueCounterpart()) ? mucUserElement : null, fallback);
 							ReadByMarker readByMarker = ReadByMarker.from(counterpart, trueJid);
 							if (message.addReadByMarker(readByMarker)) {
 								Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": added read by (" + readByMarker.getRealJid() + ") to message '" + message.getBody() + "'");