diff --git a/src/components/views/dialogs/MessageEditHistoryDialog.js b/src/components/views/dialogs/MessageEditHistoryDialog.js
index 45d46b49f2..9b11fadf83 100644
--- a/src/components/views/dialogs/MessageEditHistoryDialog.js
+++ b/src/components/views/dialogs/MessageEditHistoryDialog.js
@@ -27,13 +27,14 @@ export default class MessageEditHistoryDialog extends React.Component {
         mxEvent: PropTypes.object.isRequired,
     };
 
-    componentWillMount() {
-        this.setState({
+    constructor(props) {
+        super(props);
+        this.state = {
             events: [],
             nextBatch: null,
             isLoading: true,
             isTwelveHour: SettingsStore.getValue("showTwelveHourTimestamps"),
-        });
+        };
     }
 
     loadMoreEdits = async (backwards) => {