diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte
index 399a2cbf..b2a5df34 100644
--- a/src/routes/spaces/[relay]/[h]/+page.svelte
+++ b/src/routes/spaces/[relay]/[h]/+page.svelte
@@ -404,7 +404,8 @@
   onMount(() => {
     start()
 
-    return cleanup
+    // Wrap in a closure to avoid calling a stale cleanup function
+    return () => cleanup?.()
   })
 </script>
 
diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte
index 1c6d71a1..050150dc 100644
--- a/src/routes/spaces/[relay]/chat/+page.svelte
+++ b/src/routes/spaces/[relay]/chat/+page.svelte
@@ -297,7 +297,8 @@
   onMount(() => {
     start()
 
-    return cleanup
+    // Wrap in a closure to avoid calling a stale cleanup function
+    return () => cleanup?.()
   })
 </script>