diff --git a/src/ClientContext.tsx b/src/ClientContext.tsx
index 6a7d1753..08593a4b 100644
--- a/src/ClientContext.tsx
+++ b/src/ClientContext.tsx
@@ -343,7 +343,8 @@ export const ClientProvider: FC<Props> = ({ children }) => {
     window.matrixclient = client;
     window.isPasswordlessUser = isPasswordlessUser;
 
-    PosthogAnalytics.instance.onLoginStatusChanged();
+    if (PosthogAnalytics.hasInstance())
+      PosthogAnalytics.instance.onLoginStatusChanged();
   }, [client, isPasswordlessUser]);
 
   if (error) {
diff --git a/src/analytics/PosthogAnalytics.ts b/src/analytics/PosthogAnalytics.ts
index 0f8ba38d..ed8ada35 100644
--- a/src/analytics/PosthogAnalytics.ts
+++ b/src/analytics/PosthogAnalytics.ts
@@ -102,6 +102,10 @@ export class PosthogAnalytics {
   private platformSuperProperties = {};
   private registrationType: RegistrationType = RegistrationType.Guest;
 
+  public static hasInstance(): boolean {
+    return Boolean(this.internalInstance);
+  }
+
   public static get instance(): PosthogAnalytics {
     if (!this.internalInstance) {
       this.internalInstance = new PosthogAnalytics(posthog);