diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index ce21492c0..de400ba4c 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2708,6 +2708,8 @@ public class XmppConnectionService extends Service {
     public void destroyConversation(Conversation conversation) {
         archiveConversation(conversation);
         final Runnable runnable = () -> {
+            databaseBackend.deleteMessagesInConversation(conversation);
+
             if (!databaseBackend.deleteConversation(conversation.getAccount(), conversation.getContactJid().asBareJid(), conversation.getNextCounterpart())) {
                 Log.d(Config.LOGTAG, conversation.getJid().asBareJid() + ": unable to delete conversation");
             }