diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 956091215f..fcd3d4ed03 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -869,15 +869,15 @@ export default class MessageComposerInput extends React.Component {
             }
         }
 
-        this.client.sendMessage(this.props.room.roomId, content).done((res) => {
-            dis.dispatch({
-                action: 'message_sent',
-            });
-            // Once replies are not only for text, we can use message_sent for this
+        this.client.sendMessage(this.props.room.roomId, content).finally(() => {
             dis.dispatch({
                 action: 'reply_to_event',
                 event: null,
             });
+        }).done((res) => {
+            dis.dispatch({
+                action: 'message_sent',
+            });
         }, (e) => onSendMessageFailed(e, this.props.room));
 
         this.setState({