diff --git a/app/[searchParam]/SearchData.tsx b/app/[searchParam]/SearchData.tsx
index d8ce042..4089e1e 100644
--- a/app/[searchParam]/SearchData.tsx
+++ b/app/[searchParam]/SearchData.tsx
@@ -31,8 +31,7 @@ export default function SearchData({ searchParam }: { searchParam: string }) {
     const basePath = process.env.NEXT_PUBLIC_APP_BASE_PATH
 
     const apiClient = new LayerSwapApiClient()
-    const decodedSearchParam = decodeURIComponent(searchParam)
-    const { data, error, isLoading } = useSWR<ApiResponse<SwapData[]>>(`/explorer/${decodedSearchParam}?version=${process.env.NEXT_PUBLIC_API_VERSION}`, apiClient.fetcher, { dedupingInterval: 60000 });
+    const { data, error, isLoading } = useSWR<ApiResponse<SwapData[]>>(`/explorer/${searchParam}?version=${process.env.NEXT_PUBLIC_API_VERSION}`, apiClient.fetcher, { dedupingInterval: 60000 });
 
     const swap = data?.data?.[0]?.swap
     const quote = data?.data?.[0]?.quote
diff --git a/app/[searchParam]/page.tsx b/app/[searchParam]/page.tsx
index c8b2be2..a43b33f 100644
--- a/app/[searchParam]/page.tsx
+++ b/app/[searchParam]/page.tsx
@@ -2,9 +2,10 @@ import SearchData from "./SearchData";
 
 export default async function Page({ params }: { params: { searchParam: string } }) {
 
+  console.log(params.searchParam)
   return (
     <main className="w-full py-5 px-6 xl:px-0">
-      <SearchData searchParam={params.searchParam} />
+      <SearchData searchParam={decodeURIComponent(params.searchParam)} />
     </main>
   )
 }
diff --git a/components/Search.tsx b/components/Search.tsx
index a0ef4ee..dae9cb7 100644
--- a/components/Search.tsx
+++ b/components/Search.tsx
@@ -21,7 +21,7 @@ const Search = () => {
 
     const handleSearch = () => {
         const url = getLastPart(searchParam)
-        router.push(`/${url}`)
+        router.push(`/${encodeURIComponent(String(url))}`)
     }
 
     const clearSearch = () => {