diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index d6ea0ec5f0..8353940c90 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -107,14 +107,15 @@ export default class EditMessageComposer extends React.Component {
 
     static contextType = MatrixClientContext;
 
-    constructor(props) {
-        super(props);
+    constructor(props, context) {
+        super(props, context);
         this.model = null;
         this._editorRef = null;
 
         this.state = {
             saveDisabled: true,
         };
+        this._createEditorModel();
     }
 
     _setEditorRef = ref => {
@@ -223,10 +224,6 @@ export default class EditMessageComposer extends React.Component {
         this.props.editState.setEditorState(caret, parts);
     }
 
-    componentDidMount() {
-        this._createEditorModel();
-    }
-
     _createEditorModel() {
         const {editState} = this.props;
         const room = this._getRoom();