diff --git a/src/app/components/ContentQuote.svelte b/src/app/components/ContentQuote.svelte
index 3c9a8b3..e6e75cc 100644
--- a/src/app/components/ContentQuote.svelte
+++ b/src/app/components/ContentQuote.svelte
@@ -19,7 +19,7 @@
   const entity = id ? nip19.neventEncode({id, relays}) : addr.toNaddr()
 
   // If we found this event on a relay that the user is a member of, redirect internally
-  $: url = getMembershipUrls($userMembership).find(url => $trackerStore.hasRelay($event.id, url))
+  $: url = getMembershipUrls($userMembership).find(url => $trackerStore.hasRelay($event?.id, url))
   $: root = $event?.kind === REPLY ? $event.tags.find(nthEq(0, 'E'))?.[1] : $event?.id
   $: href = url && root ? makeThreadPath(url, root) : entityLink(entity)
 </script>
diff --git a/src/app/components/MenuSpace.svelte b/src/app/components/MenuSpace.svelte
index 467dbb4..d89dab9 100644
--- a/src/app/components/MenuSpace.svelte
+++ b/src/app/components/MenuSpace.svelte
@@ -115,7 +115,7 @@
     {/if}
   </div>
   <div in:fly={{delay: getDelay(true)}}>
-    <SecondaryNavItem href={makeSpacePath(url, "threads")}>
+    <SecondaryNavItem href={makeSpacePath(url)}>
       <Icon icon="notes-minimalistic" /> Threads
     </SecondaryNavItem>
   </div>
@@ -124,7 +124,7 @@
     <SecondaryNavHeader>Your Rooms</SecondaryNavHeader>
   </div>
   <div transition:slide={{delay: getDelay()}}>
-    <SecondaryNavItem href={makeSpacePath(url)}>
+    <SecondaryNavItem href={makeSpacePath(url, GENERAL)}>
       <Icon icon="hashtag" />
       {GENERAL}
     </SecondaryNavItem>
diff --git a/src/lib/html.ts b/src/lib/html.ts
index 72be355..03afd7b 100644
--- a/src/lib/html.ts
+++ b/src/lib/html.ts
@@ -33,11 +33,11 @@ export const createScroller = ({
 }: ScrollerOpts) => {
   let done = false
 
-  const check = async () => {
-    const container = element.classList.contains("scroll-container")
-      ? element
-      : element.closest(".scroll-container")
+  const container = element.classList.contains("scroll-container")
+    ? element
+    : element.closest(".scroll-container")
 
+  const check = async () => {
     if (container) {
       // While we have empty space, fill it
       const {scrollY, innerHeight} = window
diff --git a/src/routes/spaces/[relay]/threads/+page.svelte b/src/routes/spaces/[relay]/+page.svelte
similarity index 100%
rename from src/routes/spaces/[relay]/threads/+page.svelte
rename to src/routes/spaces/[relay]/+page.svelte
diff --git a/src/routes/spaces/[relay]/[[room]]/+page.svelte b/src/routes/spaces/[relay]/[room]/+page.svelte
similarity index 100%
rename from src/routes/spaces/[relay]/[[room]]/+page.svelte
rename to src/routes/spaces/[relay]/[room]/+page.svelte