diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 43f0079c80b88ad9bf86a463f23a25938f384203..757b6596f5f587ca4258dfe5070004f905c28263 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1283,7 +1283,10 @@ public class ConversationFragment extends XmppFragment
         binding.textinput.setRichContentListener(new String[] {"image/*"}, mEditorContentListener);
 
         binding.textSendButton.setOnClickListener(this.mSendButtonListener);
-        binding.contextPreviewCancel.setOnClickListener((v) -> setupReply(null));
+        binding.contextPreviewCancel.setOnClickListener((v) -> {
+            conversation.setUserSelectedThread(false);
+            setupReply(null);
+        });
 
         binding.scrollToBottomButton.setOnClickListener(this.mScrollButtonListener);
         binding.messagesView.setOnScrollListener(mOnScrollListener);