diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js
index 621c8b287e..ca09c3093a 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.js
@@ -161,7 +161,8 @@ export default class RoomProfileSettings extends React.Component {
         return (
             <form
                 onSubmit={this._saveProfile}
-                autoComplete="off" noValidate={true}
+                autoComplete="off"
+                noValidate={true}
                 className="mx_ProfileSettings_profileForm"
             >
                 <input type="file" ref={this._avatarUpload} className="mx_ProfileSettings_avatarUpload"
@@ -184,13 +185,15 @@ export default class RoomProfileSettings extends React.Component {
                 </div>
                 <div className="mx_ProfileSettings_buttons">
                     <AccessibleButton
-                        onClick={this._clearProfile} kind="link"
+                        onClick={this._clearProfile}
+                        kind="link"
                         disabled={!this.state.enableProfileSave}
                     >
                         {_t("Cancel")}
                     </AccessibleButton>
                     <AccessibleButton
-                        onClick={this._saveProfile} kind="primary"
+                        onClick={this._saveProfile}
+                        kind="primary"
                         disabled={!this.state.enableProfileSave}
                     >
                         {_t("Save")}
diff --git a/src/components/views/settings/AvatarSetting.js b/src/components/views/settings/AvatarSetting.js
index 84effe3dc0..487c752c38 100644
--- a/src/components/views/settings/AvatarSetting.js
+++ b/src/components/views/settings/AvatarSetting.js
@@ -21,7 +21,7 @@ import AccessibleButton from "../elements/AccessibleButton";
 import classNames from "classnames";
 
 const AvatarSetting = ({avatarUrl, avatarAltText, avatarName, uploadAvatar, removeAvatar}) => {
-    const [isHovering, setIsHovering] = useState();
+    const [isHovering, setIsHovering] = useState(false);
     const hoveringProps = {
         onMouseEnter: () => setIsHovering(true),
         onMouseLeave: () => setIsHovering(false),
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 75c0fc0226..651aa9f48d 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -155,7 +155,8 @@ export default class ProfileSettings extends React.Component {
         return (
             <form
                 onSubmit={this._saveProfile}
-                autoComplete="off" noValidate={true}
+                autoComplete="off"
+                noValidate={true}
                 className="mx_ProfileSettings_profileForm"
             >
                 <input type="file" ref={this._avatarUpload} className="mx_ProfileSettings_avatarUpload"
@@ -183,13 +184,15 @@ export default class ProfileSettings extends React.Component {
                 </div>
                 <div className="mx_ProfileSettings_buttons">
                     <AccessibleButton
-                        onClick={this._clearProfile} kind="link"
+                        onClick={this._clearProfile}
+                        kind="link"
                         disabled={!this.state.enableProfileSave}
                     >
                         {_t("Cancel")}
                     </AccessibleButton>
                     <AccessibleButton
-                        onClick={this._saveProfile} kind="primary"
+                        onClick={this._saveProfile}
+                        kind="primary"
                         disabled={!this.state.enableProfileSave}
                     >
                         {_t("Save")}