diff --git a/features/authCallback/actions/submitProviderCallback.ts b/features/authCallback/actions/submitProviderCallback.ts
index cc8627e..3a0d179 100644
--- a/features/authCallback/actions/submitProviderCallback.ts
+++ b/features/authCallback/actions/submitProviderCallback.ts
@@ -24,7 +24,7 @@ export const submitProviderCallback = async (
       throw new Error("Failed to get auth client callback URL");
 
     const responseProvision = (await backendFetch(
-      `${authClientCallbackUrl.data?.callback_url!}?callbackURI=${
+      `${authClientCallbackUrl.data?.callback_url}?callbackURI=${
         process.env.APP_URL
       }${process.env[envKey]}&${queries}`,
     )) as BackendResponse<{
@@ -36,7 +36,7 @@ export const submitProviderCallback = async (
 
     (await cookies()).set({
       name: "auth_token",
-      value: responseProvision.data?.authToken!,
+      value: responseProvision.data?.authToken || "",
       httpOnly: true,
       path: "/",
       secure: process.env.NODE_ENV === "production",
diff --git a/features/authCallback/index.tsx b/features/authCallback/index.tsx
index 5c0e57c..3cab339 100644
--- a/features/authCallback/index.tsx
+++ b/features/authCallback/index.tsx
@@ -31,7 +31,7 @@ const AuthCallbackIndex = () => {
         finishOAuthFlow("oauth-failed");
       }
     })();
-  }, []);
+  }, [name, queries]);
 
   return (
     <div className="w-full flex flex-col items-center gap-2 pt-8">
diff --git a/shared/providers/AuthSession.tsx b/shared/providers/AuthSession.tsx
index 413d6f8..ca55f9c 100644
--- a/shared/providers/AuthSession.tsx
+++ b/shared/providers/AuthSession.tsx
@@ -7,7 +7,7 @@ import AuthSessionProvider from "./AuthSession.client";
 const AuthSessionProviderWrapper = async ({
   children,
 }: Readonly<{ children: React.ReactNode }>) => {
-  let session: UserSession | null = await validateAndDecodeJWT();
+  const session: UserSession | null = await validateAndDecodeJWT();
 
   return (
     <AuthSessionProvider session={session}>{children}</AuthSessionProvider>