diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index ec904fbb2..6bdc55a12 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2159,6 +2159,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 	public void clearConversationHistory(final Conversation conversation) {
 		conversation.clearMessages();
+		conversation.setHasMessagesLeftOnServer(false); //avoid messages getting loaded through mam
 		new Thread(new Runnable() {
 			@Override
 			public void run() {