diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index e09dd0c5..18752659 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -73,7 +73,7 @@ public class MessageParser extends AbstractParser implements
 		updateLastseen(packet, account, true);
 		String body = packet.getBody();
 		if (body.matches("^\\?OTRv\\d*\\?")) {
-			conversation.resetOtrSession();
+			conversation.endOtrIfNeeded();
 		}
 		if (!conversation.hasValidOtrSession()) {
 			if (properlyAddressed) {