diff --git a/src/stores/AsyncStoreWithClient.ts b/src/stores/AsyncStoreWithClient.ts
index 5b9f95f991..4accef6f77 100644
--- a/src/stores/AsyncStoreWithClient.ts
+++ b/src/stores/AsyncStoreWithClient.ts
@@ -17,12 +17,25 @@ limitations under the License.
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { AsyncStore } from "./AsyncStore";
 import { ActionPayload } from "../dispatcher/payloads";
+import { Dispatcher } from "flux";
+import { MatrixClientPeg } from "../MatrixClientPeg";
 
 export abstract class AsyncStoreWithClient<T extends Object> extends AsyncStore<T> {
     protected matrixClient: MatrixClient;
 
     protected abstract async onAction(payload: ActionPayload);
 
+    protected constructor(dispatcher: Dispatcher<ActionPayload>, initialState: T = <T>{}) {
+        super(dispatcher, initialState);
+
+        if (MatrixClientPeg.get()) {
+            this.matrixClient = MatrixClientPeg.get();
+
+            // noinspection JSIgnoredPromiseFromCall
+            this.onReady();
+        }
+    }
+
     protected async onReady() {
         // Default implementation is to do nothing.
     }
@@ -40,8 +53,13 @@ export abstract class AsyncStoreWithClient<T extends Object> extends AsyncStore<
                 return;
             }
 
-            this.matrixClient = payload.matrixClient;
-            await this.onReady();
+            if (this.matrixClient !== payload.matrixClient) {
+                if (this.matrixClient) {
+                    await this.onNotReady();
+                }
+                this.matrixClient = payload.matrixClient;
+                await this.onReady();
+            }
         } else if (payload.action === 'on_client_not_viable' || payload.action === 'on_logged_out') {
             if (this.matrixClient) {
                 await this.onNotReady();