diff --git a/src/lib/holocene/markdown-editor/preview.svelte b/src/lib/holocene/markdown-editor/preview.svelte
index 07d99798b..35fe21904 100644
--- a/src/lib/holocene/markdown-editor/preview.svelte
+++ b/src/lib/holocene/markdown-editor/preview.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { type ClassNameValue, twMerge } from 'tailwind-merge';
 
+  import { base } from '$app/paths';
   import { page } from '$app/state';
 
   import { useDarkMode } from '$lib/utilities/dark-mode';
@@ -50,7 +51,7 @@
   const templatedContent = $derived(replaceTemplate(content));
   const previewTheme = $derived($useDarkMode ? 'dark' : 'light');
   const previewPath = $derived(
-    `/render?content=${encodeURIComponent(templatedContent)}&theme=${previewTheme}&overrideTheme=${overrideTheme}`,
+    `${base}/render?content=${encodeURIComponent(templatedContent)}&theme=${previewTheme}&overrideTheme=${overrideTheme}`,
   );
 </script>
 
diff --git a/src/lib/holocene/navigation/navigation-container.svelte b/src/lib/holocene/navigation/navigation-container.svelte
index c0f1f62d0..2439ec4e9 100644
--- a/src/lib/holocene/navigation/navigation-container.svelte
+++ b/src/lib/holocene/navigation/navigation-container.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { twMerge as merge } from 'tailwind-merge';
 
+  import { base } from '$app/paths';
   import { page } from '$app/stores';
 
   import Icon from '$lib/holocene/icon/icon.svelte';
@@ -13,6 +14,7 @@
   const toggle = () => ($navOpen = !$navOpen);
 
   $: version = $page.data?.settings?.version ?? '';
+  $: baseUrl = base === '' ? '/' : base;
 </script>
 
 <nav
@@ -30,7 +32,7 @@
   <div
     class="flex items-center justify-between pb-4 group-data-[nav=closed]:flex-col group-data-[nav=closed]:gap-2"
   >
-    <a href="/" class="flex w-fit items-center gap-1 text-nowrap">
+    <a href={baseUrl} class="flex w-fit items-center gap-1 text-nowrap">
       <Logo height={24} width={24} class="m-1" />
       <p class="text-base font-medium group-data-[nav=closed]:hidden">
         {isCloud ? 'Cloud' : 'Self-Hosted'}