diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 5e4aae5ba2..d0ad2371d3 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -867,14 +867,15 @@ export default class MessageComposerInput extends React.Component {
                 }
                 content.body = nestedReply.body + content.body;
             }
+
+            // Clear reply_to_event as we put the message into the queue
+            // if the send fails, retry will handle resending.
+            dis.dispatch({
+                action: 'reply_to_event',
+                event: null,
+            });
         }
 
-        // Clear reply_to_event as we put the message into the queue
-        // if the send fails, retry will handle resending.
-        dis.dispatch({
-            action: 'reply_to_event',
-            event: null,
-        });
 
         this.client.sendMessage(this.props.room.roomId, content).done((res) => {
             dis.dispatch({