diff --git a/components/blog.tsx b/components/blog.tsx
index 959c2e2..057a892 100644
--- a/components/blog.tsx
+++ b/components/blog.tsx
@@ -23,7 +23,7 @@ import { useRouter } from 'next/router';
 import { MdxFile } from "nextra";
 import { Link } from "nextra-theme-docs";
 import { getPagesUnderRoute } from "nextra/context";
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import Picture from "./picture";
@@ -47,21 +47,44 @@ export function BlogHeader() {
 export function BlogIndex() {
     const router = useRouter();
     const locale = router.locale || websiteConfig.default_locale;
-    const activeTag = router.query.tag as string | undefined;
+    const activeTag = (router.query.tag as string | undefined)?.trim();
     let tagCounts: Record<string, number> = {};
 
     // Get all posts from route
     const allPosts = getPagesUnderRoute("/blog").filter((page) => {
         const frontMatter = (page as MdxFile).frontMatter || {};
         // Get tag counts for the tag bar
-        if(frontMatter.tags && Array.isArray(frontMatter.tags)) {
+        if (frontMatter.tags && Array.isArray(frontMatter.tags)) {
             frontMatter.tags.forEach((tag: string) => {
                 tagCounts[tag] = (tagCounts[tag] || 0) + 1;
             });
         }
-        if(frontMatter.hidden){return null}
+        if (frontMatter.hidden) {return null}
         return frontMatter;
     });
+    
+    // Redirect to main blog page if no tag specified or empty tag
+    // (but only after router is ready and we've attempted to parse the tag)
+    useEffect(() => {
+        if (router.isReady && !activeTag &&
+            (
+                !router.query.tag ||
+                (typeof router.query.tag === 'string' && router.query.tag.trim() === '') ||
+                !router.asPath.includes('?tag=') ||
+                router.asPath.includes('?tag=&') ||
+                router.asPath.endsWith('?tag=')
+            )
+        ) {
+            router.push('/blog')
+        } // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [router.isReady, activeTag, router.query.tag, router.asPath])
+
+    // Redirect if tag has no posts
+    useEffect(() => {
+        if (router.isReady && activeTag && (!tagCounts[activeTag] || tagCounts[activeTag] === 0)) {
+            router.push('/blog')
+        } // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [router.isReady, activeTag])
 
     // Filter blogs by tag
     const filteredPosts = allPosts.filter((page) => {