diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index e28fcffbf8..49eb331aef 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -60,13 +60,8 @@ export default class EditableText extends React.Component {
         this.placeholder = false;
 
         this._editable_div = createRef();
-
-        this.state = {
-            phase: EditableText.Phases.Display,
-        };
     }
 
-
     state = {
         phase: EditableText.Phases.Display,
     };
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 33b98f977d..212e9bfad8 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -56,7 +56,8 @@ export default class MemberList extends React.Component {
         }
     }
 
-    componentDidMount() {
+    // eslint-disable-next-line camelcase
+    UNSAFE_componentWillMount() {
         const cli = MatrixClientPeg.get();
         this._mounted = true;
         if (cli.hasLazyLoadMembersEnabled()) {