diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index cd1a51245e..d70cb5c786 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -415,9 +415,10 @@ export default class MessageComposer extends React.Component {
         this.messageComposerInput._sendMessage();
     }
 
-    onIsEmptyChanged = (isEmpty) => {
+    onChange = () => {
+        if (!this.messageComposerInput) return;
         this.setState({
-            isComposerEmpty: isEmpty,
+            isComposerEmpty: this.messageComposerInput.model.isEmpty,
         });
     }
 
@@ -446,7 +447,7 @@ export default class MessageComposer extends React.Component {
                     resizeNotifier={this.props.resizeNotifier}
                     permalinkCreator={this.props.permalinkCreator}
                     replyToEvent={this.props.replyToEvent}
-                    onIsEmptyChanged={this.onIsEmptyChanged}
+                    onChange={this.onChange}
                 />,
                 <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
                 <EmojiButton key="emoji_button" addEmoji={this.addEmoji} />,
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 9a14e33d05..657d67aee2 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -117,7 +117,7 @@ export default class SendMessageComposer extends React.Component {
         placeholder: PropTypes.string,
         permalinkCreator: PropTypes.object.isRequired,
         replyToEvent: PropTypes.object,
-        onIsEmptyChanged: PropTypes.func,
+        onChange: PropTypes.func,
     };
 
     static contextType = MatrixClientContext;
@@ -538,9 +538,7 @@ export default class SendMessageComposer extends React.Component {
     }
 
     onChange = () => {
-        if (this.props.onIsEmptyChanged) {
-            this.props.onIsEmptyChanged(this.model.isEmpty);
-        }
+        if (this.props.onChange) this.props.onChange();
     }
 
     render() {