diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 14d77c3907b1b03db003f3547139a698121acb0e..2fca12451b761935abdb91360c87896d15239a40 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -607,6 +607,7 @@ public class ConversationFragment extends XmppFragment
             conversation.setLockThread(false);
             this.setEnabled(false);
             conversation.setUserSelectedThread(false);
+            setThread(null);
             refresh();
             updateThreadFromLastMessage();
         }