diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index 10a4d96921..67d9616741 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -157,6 +157,7 @@ class FlairStore extends EventEmitter {
      * @returns The profile if known, otherwise null.
      */
     getGroupProfileCachedFast(matrixClient, groupId) {
+        if (!matrixClient || !groupId) return null;
         if (this._groupProfiles[groupId]) {
             return this._groupProfiles[groupId];
         }