diff --git a/packages/mermaid/src/docs/.vitepress/config.ts b/packages/mermaid/src/docs/.vitepress/config.ts
index 216541d52..33e930cb8 100644
--- a/packages/mermaid/src/docs/.vitepress/config.ts
+++ b/packages/mermaid/src/docs/.vitepress/config.ts
@@ -14,9 +14,9 @@ export default defineConfig({
   lang: 'en-US',
   title: 'Mermaid',
   description: 'Create diagrams and visualizations using text and code.',
-  base: '/mermaid/',
+  base: '/',
   markdown: allMarkdownTransformers,
-  head: [['link', { rel: 'icon', type: 'image/x-icon', href: '/mermaid/favicon.ico' }]],
+  head: [['link', { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]],
   themeConfig: {
     nav: nav(),
     editLink: {
diff --git a/packages/mermaid/src/docs/.vitepress/theme/index.ts b/packages/mermaid/src/docs/.vitepress/theme/index.ts
index efb065fea..ef929aa5d 100644
--- a/packages/mermaid/src/docs/.vitepress/theme/index.ts
+++ b/packages/mermaid/src/docs/.vitepress/theme/index.ts
@@ -18,7 +18,7 @@ export default {
         if (newPath) {
           console.log(`Redirecting to ${newPath} from ${window.location}`);
           // router.go isn't loading the ID properly.
-          window.location.href = `/mermaid/${newPath}`;
+          window.location.href = `/${newPath}`;
         }
       } catch (e) {}
     };
diff --git a/packages/mermaid/src/docs/.vitepress/theme/redirect.ts b/packages/mermaid/src/docs/.vitepress/theme/redirect.ts
index ca4606be0..b6cfa4de2 100644
--- a/packages/mermaid/src/docs/.vitepress/theme/redirect.ts
+++ b/packages/mermaid/src/docs/.vitepress/theme/redirect.ts
@@ -10,7 +10,9 @@ export interface Redirect {
 const getBaseFile = (link: string): Redirect => {
   const url = new URL(link);
   if (
-    (url.hostname !== 'mermaid-js.github.io' && url.hostname !== 'localhost') ||
+    (url.hostname !== 'mermaid-js.github.io' &&
+      url.hostname !== 'mermaid.js.org' &&
+      url.hostname !== 'localhost') ||
     url.pathname !== '/mermaid/'
   ) {
     throw new Error('Not mermaidjs url');