diff --git a/site/src/components/SearchWidget.astro b/site/src/components/SearchWidget.astro
index 57dc0f8..58dbdbe 100644
--- a/site/src/components/SearchWidget.astro
+++ b/site/src/components/SearchWidget.astro
@@ -5,7 +5,7 @@ interface Props {
   class?: string;
 }
 const { class: extraClass = '' } = Astro.props;
-const base = import.meta.env.BASE_URL;
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
 ---
 
 <div id="search" class={extraClass}></div>
@@ -14,7 +14,7 @@ const base = import.meta.env.BASE_URL;
 <script>
   // Load Pagefind UI lazily (only when the search div is visible/focused)
   function initPagefind() {
-    const base = import.meta.env.BASE_URL;
+    const base = import.meta.env.BASE_URL.replace(/\/$/, '');
     // @ts-ignore
     import(`${base}/pagefind/pagefind-ui.js`).then((module) => {
       const PagefindUI = module.PagefindUI;
diff --git a/site/src/layouts/BaseLayout.astro b/site/src/layouts/BaseLayout.astro
index 4b9d84b..243d1d7 100644
--- a/site/src/layouts/BaseLayout.astro
+++ b/site/src/layouts/BaseLayout.astro
@@ -31,7 +31,7 @@ const {
   dateModified,
 } = Astro.props;
 
-const base = import.meta.env.BASE_URL;
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
 const canonical = canonicalUrl ?? `${SITE_ORIGIN}${base}${Astro.url.pathname.replace(base, '')}`;
 ---
 
diff --git a/site/src/layouts/GuideLayout.astro b/site/src/layouts/GuideLayout.astro
index 0b34d07..a18c3cf 100644
--- a/site/src/layouts/GuideLayout.astro
+++ b/site/src/layouts/GuideLayout.astro
@@ -27,7 +27,7 @@ interface Props {
 }
 
 const { title, description, breadcrumbs = [], icon = 'book', badge = 'Guide', extraJsonLd, dateUpdated, keywords, readingTime } = Astro.props;
-const base = import.meta.env.BASE_URL;
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
 const canonicalUrl = `${SITE_ORIGIN}${base}${Astro.url.pathname.replace(base, '')}`;
 
 const dateModified = dateUpdated ?? new Date().toISOString().slice(0, 10);
diff --git a/site/src/pages/alertmanager.astro b/site/src/pages/alertmanager.astro
index 5e2b5e5..64e69f9 100644
--- a/site/src/pages/alertmanager.astro
+++ b/site/src/pages/alertmanager.astro
@@ -1,7 +1,7 @@
 ---
 import GuideLayout from '../layouts/GuideLayout.astro';
 
-const base = import.meta.env.BASE_URL;
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
 
 const howToJsonLd = {
   '@context': 'https://schema.org',
diff --git a/site/src/pages/blackbox-exporter.astro b/site/src/pages/blackbox-exporter.astro
index 7edbcaa..58eecfb 100644
--- a/site/src/pages/blackbox-exporter.astro
+++ b/site/src/pages/blackbox-exporter.astro
@@ -1,7 +1,7 @@
 ---
 import GuideLayout from '../layouts/GuideLayout.astro';
 
-const base = import.meta.env.BASE_URL;
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
 
 const howToJsonLd = {
   '@context': 'https://schema.org',
diff --git a/site/src/pages/index.astro b/site/src/pages/index.astro
index e23aff5..f72210a 100644
--- a/site/src/pages/index.astro
+++ b/site/src/pages/index.astro
@@ -6,7 +6,7 @@ import SearchWidget from '../components/SearchWidget.astro';
 import { data, getGroupSlug, getRuleCount, getTotalRuleCount, getTotalServiceCount, getPopularServices } from '../data/rules';
 import { SITE_URL, GITHUB_URL, schemaAuthor, schemaPublisher, schemaWebSite, SITE_DATE_PUBLISHED, LICENSE_CC_BY_URL, LICENSE_MIT_URL } from '../data/site';
 
-const base = import.meta.env.BASE_URL;
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
 const totalRules = getTotalRuleCount();
 const totalServices = getTotalServiceCount();
 const popularServices = getPopularServices();
diff --git a/site/src/pages/rules/[group]/[service].astro b/site/src/pages/rules/[group]/[service].astro
index 6888f7d..224b102 100644
--- a/site/src/pages/rules/[group]/[service].astro
+++ b/site/src/pages/rules/[group]/[service].astro
@@ -15,7 +15,7 @@ export function getStaticPaths() {
 }
 
 const { group, service } = Astro.props;
-const base = import.meta.env.BASE_URL;
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
 const groupSlug = getGroupSlug(group);
 const serviceSlug = getServiceSlug(service);
 const ruleCount = getRuleCount(service);
diff --git a/site/src/pages/rules/[group]/index.astro b/site/src/pages/rules/[group]/index.astro
index 8c1f6ef..cd76b90 100644
--- a/site/src/pages/rules/[group]/index.astro
+++ b/site/src/pages/rules/[group]/index.astro
@@ -14,7 +14,7 @@ export function getStaticPaths() {
 }
 
 const { group } = Astro.props;
-const base = import.meta.env.BASE_URL;
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
 const groupSlug = getGroupSlug(group);
 const totalRules = group.services.reduce((sum, svc) => sum + getRuleCount(svc), 0);
 
diff --git a/site/src/pages/rules/index.astro b/site/src/pages/rules/index.astro
index bc705a3..5881394 100644
--- a/site/src/pages/rules/index.astro
+++ b/site/src/pages/rules/index.astro
@@ -6,7 +6,7 @@ import CautionBanner from '../../components/CautionBanner.astro';
 import { data, getGroupSlug, getServiceSlug, getRuleCount, getTotalRuleCount, getTotalServiceCount, buildRedirectMap } from '../../data/rules';
 import { SITE_URL, schemaWebSite } from '../../data/site';
 
-const base = import.meta.env.BASE_URL;
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
 const totalRules = getTotalRuleCount();
 const totalServices = getTotalServiceCount();
 const redirectMap = buildRedirectMap(base);