diff --git a/apps/admin/src/sections/user/user-subscription/index.tsx b/apps/admin/src/sections/user/user-subscription/index.tsx
index 744d30d..a279d18 100644
--- a/apps/admin/src/sections/user/user-subscription/index.tsx
+++ b/apps/admin/src/sections/user/user-subscription/index.tsx
@@ -1,3 +1,4 @@
+import { Link } from "@tanstack/react-router";
 import { Button } from "@workspace/ui/components/button";
 import {
   DropdownMenu,
@@ -207,32 +208,36 @@ function RowMoreActions({ userId, subId }: { userId: number; subId: number }) {
         </DropdownMenuTrigger>
         <DropdownMenuContent align="end">
           <DropdownMenuItem asChild>
-            <a
-              href={`/dashboard/log/subscribe?user_id=${userId}&user_subscribe_id=${subId}`}
+            <Link
+              search={{ user_id: userId, user_subscribe_id: subId }}
+              to="/dashboard/log/subscribe"
             >
               {t("subscriptionLogs", "Subscription Logs")}
-            </a>
+            </Link>
           </DropdownMenuItem>
           <DropdownMenuItem asChild>
-            <a
-              href={`/dashboard/log/reset-subscribe?user_id=${userId}&user_subscribe_id=${subId}`}
+            <Link
+              search={{ user_id: userId, user_subscribe_id: subId }}
+              to="/dashboard/log/reset-subscribe"
             >
               {t("resetLogs", "Reset Logs")}
-            </a>
+            </Link>
           </DropdownMenuItem>
           <DropdownMenuItem asChild>
-            <a
-              href={`/dashboard/log/subscribe-traffic?user_id=${userId}&user_subscribe_id=${subId}`}
+            <Link
+              search={{ user_id: userId, user_subscribe_id: subId }}
+              to="/dashboard/log/subscribe-traffic"
             >
               {t("trafficStats", "Traffic Stats")}
-            </a>
+            </Link>
           </DropdownMenuItem>
           <DropdownMenuItem asChild>
-            <a
-              href={`/dashboard/log/traffic-details?user_id=${userId}&subscribe_id=${subId}`}
+            <Link
+              search={{ user_id: userId, subscribe_id: subId }}
+              to="/dashboard/log/traffic-details"
             >
               {t("trafficDetails", "Traffic Details")}
-            </a>
+            </Link>
           </DropdownMenuItem>
           <DropdownMenuItem
             onSelect={(e) => {
diff --git a/apps/user/src/layout/footer.tsx b/apps/user/src/layout/footer.tsx
index 4ba5df3..221a597 100644
--- a/apps/user/src/layout/footer.tsx
+++ b/apps/user/src/layout/footer.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { Link } from "@tanstack/react-router";
 import { Separator } from "@workspace/ui/components/separator";
 import { Icon } from "@workspace/ui/composed/icon";
 import { Fragment, useMemo } from "react";
@@ -112,12 +113,12 @@ export default function Footer() {
           <strong className="text-foreground">{site.site_name}</strong> ©{" "}
           {t("footer.copyright", "All rights reserved")}.
           <div>
-            <a className="underline" href="/tos">
+            <Link className="underline" to="/tos">
               {t("footer.tos", "Terms of Service")}
-            </a>
-            <a className="ml-2 underline" href="/privacy-policy">
+            </Link>
+            <Link className="ml-2 underline" to="/privacy-policy">
               {t("footer.privacyPolicy", "Privacy Policy")}
-            </a>
+            </Link>
           </div>
         </div>
       </div>