diff --git a/frontend/src/lib/common/presenter/ui/Navbar.tsx b/frontend/src/lib/common/presenter/ui/Navbar.tsx
index 1270cac..def71a6 100644
--- a/frontend/src/lib/common/presenter/ui/Navbar.tsx
+++ b/frontend/src/lib/common/presenter/ui/Navbar.tsx
@@ -1,10 +1,12 @@
+import Link from "next/link";
+
 export default function Navbar() {
   return (
     <div className="border-b border-gray-300">
       <div className="mx-auto flex h-[--tool-bar-height] max-w-screen-xl flex-row items-center justify-between px-4 md:px-6">
-        <a className="text-2xl font-black text-gray-800" href="/">
+        <Link className="text-2xl font-black text-gray-800" href="/">
           魚之魷魂
-        </a>
+        </Link>
         <div className="flex flex-row items-center gap-x-6">
           <Action label="首頁" link="/" isSelected={true} />
         </div>
@@ -18,12 +20,12 @@ function Action(props: { label: string; link: string; isSelected: boolean }) {
     <div
       className={`rounded px-1.5 ${props.isSelected ? "bg-blue-600" : "bg-transparent"}`}
     >
-      <a
+      <Link
         className={`font-extrabold ${props.isSelected ? "text-white" : "text-gray-800"}`}
         href={props.link}
       >
         {props.label}
-      </a>
+      </Link>
     </div>
   );
 }
diff --git a/frontend/src/lib/home/framework/ui/SelfTags.tsx b/frontend/src/lib/home/framework/ui/SelfTags.tsx
index 00d2f3a..27aad53 100644
--- a/frontend/src/lib/home/framework/ui/SelfTags.tsx
+++ b/frontend/src/lib/home/framework/ui/SelfTags.tsx
@@ -9,12 +9,12 @@ import { tagStartedAction, tagStoppedAction } from "../../presenter/tagSlice";
 export default function SelfTags() {
   return (
     <Provider store={tagStore}>
-      <_SelfTags />
+      <SelfTagsProvided />
     </Provider>
   );
 }
 
-function _SelfTags() {
+function SelfTagsProvided() {
   const tags = useTagSelector((state) => state.tag.tags);
   const dispatch = useTagDispatch();
 
@@ -26,7 +26,7 @@ function _SelfTags() {
       dispatch(tagStoppedAction());
       setIsTagsVisible(false);
     };
-  }, []);
+  }, [dispatch]);
 
   useEffect(() => {
     if (tags.length === 0) return;