diff --git a/src/settings/handlers/MatrixClientBackedSettingsHandler.ts b/src/settings/handlers/MatrixClientBackedSettingsHandler.ts
index c9c670f5d9..76825d1335 100644
--- a/src/settings/handlers/MatrixClientBackedSettingsHandler.ts
+++ b/src/settings/handlers/MatrixClientBackedSettingsHandler.ts
@@ -44,7 +44,7 @@ export default abstract class MatrixClientBackedSettingsHandler extends Settings
     }
 
     public get client(): MatrixClient {
-        return MatrixClientBackedSettingsHandler.matrixClient;
+        return MatrixClientBackedSettingsHandler._matrixClient;
     }
 
     protected initMatrixClient(oldClient: MatrixClient, newClient: MatrixClient) {
diff --git a/src/settings/handlers/RoomSettingsHandler.ts b/src/settings/handlers/RoomSettingsHandler.ts
index cc9496c82b..4b4d4c4ad9 100644
--- a/src/settings/handlers/RoomSettingsHandler.ts
+++ b/src/settings/handlers/RoomSettingsHandler.ts
@@ -34,13 +34,13 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
 
     protected initMatrixClient(oldClient: MatrixClient, newClient: MatrixClient) {
         if (oldClient) {
-            oldClient.removeListener("RoomState.events", this._onEvent);
+            oldClient.removeListener("RoomState.events", this.onEvent);
         }
 
-        newClient.on("RoomState.events", this._onEvent);
+        newClient.on("RoomState.events", this.onEvent);
     }
 
-    private _onEvent = (event: MatrixEvent, state: RoomState, prevEvent: MatrixEvent) => {
+    private onEvent = (event: MatrixEvent, state: RoomState, prevEvent: MatrixEvent) => {
         const roomId = event.getRoomId();
         const room = this.client.getRoom(roomId);