diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index e4cdd45e97cb0b97169825883f9cc879a21a8d3b..a9a52b85f34ad23123ecd28707759660229032f3 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1000,7 +1000,6 @@ public class ConversationFragment extends XmppFragment
                     reactionBuilder.addAll(aggregated.ourReactions);
                     reactionBuilder.add(body.toString().replaceAll("\\s", ""));
                     activity.xmppConnectionService.sendReactions(conversation.getReplyTo(), reactionBuilder.build());
-                    setupReply(null);
                     messageSent();
                     return;
                 } else {
@@ -1060,7 +1059,6 @@ public class ConversationFragment extends XmppFragment
             if (message.getStatus() == Message.STATUS_WAITING) {
                 if (sendAt != null) message.setTime(sendAt);
                 activity.xmppConnectionService.updateMessage(message);
-                setupReply(null);
                 messageSent();
                 return;
             } else {
@@ -3951,6 +3949,7 @@ public class ConversationFragment extends XmppFragment
         binding.textinputSubject.setText("");
         binding.textinputSubject.setVisibility(View.GONE);
         setThread(null);
+        setupReply(null);
         conversation.setUserSelectedThread(false);
         mSendingPgpMessage.set(false);
         this.binding.textinput.setText("");