diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
index 4138b00bdf..cc27ccf153 100644
--- a/src/components/views/rooms/SendMessageComposer.tsx
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -165,7 +165,7 @@ export default class SendMessageComposer extends React.Component<IProps> {
     }
 
     public componentDidUpdate(prevProps: IProps): void {
-        const replyToEventChanged = this.props.replyToEvent !== prevProps.replyToEvent;
+        const replyToEventChanged = this.props.replyInThread && (this.props.replyToEvent !== prevProps.replyToEvent);
         if (replyToEventChanged) {
             this.model.reset([]);
         }