diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte
index 63779308..c874a051 100644
--- a/src/app/components/PrimaryNav.svelte
+++ b/src/app/components/PrimaryNav.svelte
@@ -55,7 +55,7 @@
 
 <div
   class="ml-sai mt-sai mb-sai relative z-nav hidden w-14 flex-shrink-0 bg-base-200 pt-4 md:block">
-  <div class="flex h-full flex-col justify-between">
+  <div class="flex h-full flex-col" class:justify-between={PLATFORM_RELAYS.length === 0}>
     <div>
       {#each PLATFORM_RELAYS as url (url)}
         <PrimaryNavItemSpace {url} />
@@ -81,6 +81,9 @@
         </PrimaryNavItem>
       {/each}
     </div>
+    {#if PLATFORM_RELAYS.length > 0}
+      <Divider />
+    {/if}
     <div>
       <PrimaryNavItem
         title="Settings"
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index bdec50e1..b9feb91b 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,6 +1,14 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {goto} from "$app/navigation"
+  import {makeSpacePath} from "@app/util/routes"
+  import {PLATFORM_RELAYS} from "@app/core/state"
 
-  onMount(() => goto("/home"))
+  onMount(() => {
+    if (PLATFORM_RELAYS.length > 0) {
+      goto(makeSpacePath(PLATFORM_RELAYS[0]))
+    } else {
+      goto("/home")
+    }
+  })
 </script>