diff --git a/qwilight-fe/src/avatar/AvatarView.tsx b/qwilight-fe/src/avatar/AvatarView.tsx
index 82aef50..b6b5926 100644
--- a/qwilight-fe/src/avatar/AvatarView.tsx
+++ b/qwilight-fe/src/avatar/AvatarView.tsx
@@ -1,5 +1,4 @@
 import { useEffect, useState } from "react";
-import { useParams } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { observer } from "mobx-react-lite";
 import { sprintf } from "sprintf-js";
@@ -17,7 +16,7 @@
   TabContent,
   TabPane,
 } from "reactstrap";
-import { useTo } from "taehui-ts/fe-utility";
+import { useWant } from "taehui-ts/fe-utility";
 
 import { useAvatarStore, useSiteStore } from "src/Stores";
 import DateView from "src/avatar/DateView";
@@ -82,14 +81,12 @@
   const [tabPosition, setTabPosition] = useState(0);
   const [isLoading, setLoading] = useState(false);
 
-  const to = useTo();
-
-  const { want } = useParams<{ want: string }>();
+  const { want, setWant } = useWant("/qwilight/avatar");
 
   const { t } = useTranslation();
 
   useEffect(() => {
-    setInput(want ?? "");
+    setInput(want);
   }, [want, setInput]);
 
   useEffect(() => {
@@ -190,7 +187,7 @@
   ]);
 
   const onWant = () => {
-    to(`/qwilight/avatar/${input}`);
+    setWant(input);
   };
 
   const getProperties = (i: number) => ({
@@ -208,10 +205,10 @@
             color="info"
             onClick={() => {
               if (isSignedIn) {
-                to(
-                  `/qwilight/avatar/${encodeURIComponent(
-                    "#",
-                  )}${getDefaultAvatarID(siteAvatarID)}`,
+                setWant(
+                  `${encodeURIComponent("#")}${getDefaultAvatarID(
+                    siteAvatarID,
+                  )}`,
                 );
               } else {
                 setSignInOpened(true);
@@ -245,7 +242,7 @@
           <Button
             color="danger"
             onClick={() => {
-              to("/qwilight/avatar");
+              setWant("");
             }}
           >
             {t("onClose")}
@@ -264,11 +261,7 @@
                     <Row
                       className="g-0 route"
                       onClick={() => {
-                        to(
-                          `/qwilight/avatar/${encodeURIComponent(
-                            "#",
-                          )}${avatarID}`,
-                        );
+                        setWant(`${encodeURIComponent("#")}${avatarID}`);
                       }}
                     >
                       <Col className="m-1" xs="auto">