diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 7918243631..61d61b8f42 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -489,7 +489,7 @@ export default class MessageComposer extends React.Component {
                 }
             }
 
-            if (this.state.showSendButton) {
+            if (!this.state.isComposerEmpty) {
                 controls.push(
                     <SendButton onClick={this.sendMessage} />,
                 );