diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 65dfd753..87f0e19c 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -29,7 +29,6 @@
   import { restoreFromFile } from "$lib/backup/backup";
   import { goto } from "$app/navigation";
   import { hotkeys } from "$lib/title";
-  import { initMatrixClient } from "$lib/chat/chat";
 
   const locale =
     ((browser && localStorage.getItem("locale")) as Locales) || detectLocale();
@@ -66,9 +65,6 @@
     if (browser && $userPreferences.autoConnect && (await canAutoConnect())) {
       await initSerial();
     }
-    if (browser) {
-      await initMatrixClient();
-    }
 
     if (data.importFile) {
       restoreFromFile(data.importFile);
diff --git a/src/routes/(app)/chat/+page.svelte b/src/routes/(app)/chat/+page.svelte
index d0b06b64..36834927 100644
--- a/src/routes/(app)/chat/+page.svelte
+++ b/src/routes/(app)/chat/+page.svelte
@@ -1,8 +1,16 @@
 <script lang="ts">
-  import { isLoggedIn, matrix } from "$lib/chat/chat";
+  import { initMatrixClient, isLoggedIn, matrix } from "$lib/chat/chat";
   import { flip } from "svelte/animate";
   import { slide } from "svelte/transition";
   import Login from "./Login.svelte";
+  import { onMount } from "svelte";
+  import { browser } from "$app/environment";
+
+  onMount(async () => {
+    if (browser) {
+      await initMatrixClient();
+    }
+  });
 
   let { children } = $props();