diff --git a/src/pages/tag/[tag]/index.astro b/src/pages/tag/[tag]/index.astro
index ab5193c..17baed0 100644
--- a/src/pages/tag/[tag]/index.astro
+++ b/src/pages/tag/[tag]/index.astro
@@ -28,7 +28,7 @@ const page = {
   },
 };
 
-const canonical = `${site.url}/tag/${tag}/`;
+const canonical = `${site.url}/tag/${encodeURIComponent(tag)}/`;
 ---
 <Layout
   title={`Tagged: ${tag} — ${site.name}`}
diff --git a/src/pages/tag/[tag]/page/[page]/index.astro b/src/pages/tag/[tag]/page/[page]/index.astro
index c59de43..4ccc8f7 100644
--- a/src/pages/tag/[tag]/page/[page]/index.astro
+++ b/src/pages/tag/[tag]/page/[page]/index.astro
@@ -43,7 +43,7 @@ const page = {
   },
 };
 
-const canonical = `${site.url}/tag/${tag}/page/${currentPage}/`;
+const canonical = `${site.url}/tag/${encodeURIComponent(tag)}/page/${currentPage}/`;
 ---
 <Layout
   title={`Tagged: ${tag} — Page ${currentPage} — ${site.name}`}