diff --git a/frontend/src/contexts/auth.context.tsx b/frontend/src/contexts/auth.context.tsx
index 99978f15..04e21c4d 100644
--- a/frontend/src/contexts/auth.context.tsx
+++ b/frontend/src/contexts/auth.context.tsx
@@ -8,7 +8,7 @@
 
 import getConfig from "next/config";
 import { useRouter } from "next/router";
-import { createContext, ReactNode, useEffect, useState } from "react";
+import { createContext, ReactNode } from "react";
 import {
   QueryObserverResult,
   RefetchOptions,
@@ -25,7 +25,6 @@ import { useSubscribeBroadcastChannel } from "@/hooks/useSubscribeBroadcastChann
 import { useTranslate } from "@/hooks/useTranslate";
 import { RouterType } from "@/services/types";
 import { IUser } from "@/types/user.types";
-import { getFromQuery } from "@/utils/URL";
 
 export interface AuthContextValue {
   user: IUser | undefined;
@@ -51,10 +50,8 @@ const { publicRuntimeConfig } = getConfig();
 
 export const AuthProvider = ({ children }: AuthProviderProps): JSX.Element => {
   const router = useRouter();
-  const [search, setSearch] = useState("");
   const hasPublicPath = PUBLIC_PATHS.includes(router.pathname);
   const { i18n } = useTranslate();
-  const [isReady, setIsReady] = useState(false);
   const queryClient = useQueryClient();
   const updateLanguage = (lang: string) => {
     i18n.changeLanguage(lang);
@@ -66,11 +63,11 @@ export const AuthProvider = ({ children }: AuthProviderProps): JSX.Element => {
   };
   const authRedirection = async (isAuthenticated: boolean) => {
     if (isAuthenticated) {
-      const redirect = getFromQuery({ search, key: "redirect" });
-      const nextPage = redirect && decodeURIComponent(redirect);
-
-      if (nextPage?.startsWith("/")) {
-        await router.push(nextPage);
+      if (
+        router.query.redirect &&
+        router.query.redirect.toString().startsWith("/")
+      ) {
+        await router.push(router.query.redirect.toString());
       } else if (hasPublicPath) {
         await router.push(RouterType.HOME);
       }
@@ -109,14 +106,9 @@ export const AuthProvider = ({ children }: AuthProviderProps): JSX.Element => {
     router.reload();
   });
 
-  useEffect(() => {
-    const search = location.search;
-
-    setSearch(search);
-    setIsReady(true);
-  }, []);
-
-  if (!isReady || isLoading) return <Progress />;
+  if (isLoading) {
+    return <Progress />;
+  }
 
   return (
     <AuthContext.Provider
diff --git a/frontend/src/utils/URL.ts b/frontend/src/utils/URL.ts
index 0c85749d..bbb01a14 100644
--- a/frontend/src/utils/URL.ts
+++ b/frontend/src/utils/URL.ts
@@ -6,26 +6,6 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-export const getFromQuery = ({
-  key,
-  search,
-  defaultValue = "",
-}: {
-  key: string;
-  search?: string;
-  defaultValue?: string;
-}) => {
-  try {
-    const paramsString = search || window.location.search;
-    const searchParams = new URLSearchParams(paramsString);
-    const loadCampaign = searchParams.get(key) || defaultValue;
-
-    return loadCampaign;
-  } catch (e) {
-    return defaultValue;
-  }
-};
-
 export const buildURL = (baseUrl: string, relativePath: string): string => {
   try {
     return new URL(relativePath).toString();