diff --git a/packages/web/src/app/login/components/loginForm.tsx b/packages/web/src/app/login/components/loginForm.tsx
index 3df9f1cf..8b63a477 100644
--- a/packages/web/src/app/login/components/loginForm.tsx
+++ b/packages/web/src/app/login/components/loginForm.tsx
@@ -13,13 +13,14 @@ import googleLogo from "@/public/google.svg";
 import Image from "next/image";
 import { signIn } from "next-auth/react";
 import { useCallback, useMemo } from "react";
-import { useNonEmptyQueryParam } from "@/hooks/useNonEmptyQueryParam";
 import { verifyCredentialsRequestSchema } from "@/lib/schemas";
 
-export const LoginForm = () => {
-    const callbackUrl = useNonEmptyQueryParam("callbackUrl");
-    const error = useNonEmptyQueryParam("error");
+interface LoginFormProps {
+    callbackUrl?: string;
+    error?: string;
+}
 
+export const LoginForm = ({ callbackUrl, error }: LoginFormProps) => {
     const form = useForm<z.infer<typeof verifyCredentialsRequestSchema>>({
         resolver: zodResolver(verifyCredentialsRequestSchema),
         defaultValues: {
diff --git a/packages/web/src/app/login/page.tsx b/packages/web/src/app/login/page.tsx
index b8c0b613..cf0a9763 100644
--- a/packages/web/src/app/login/page.tsx
+++ b/packages/web/src/app/login/page.tsx
@@ -1,12 +1,16 @@
 import { LoginForm } from "./components/loginForm";
-import { Suspense } from "react";
 
-export default async function Login() {
+interface LoginProps {
+    searchParams: {
+        callbackUrl?: string;
+        error?: string;
+    }
+}
+
+export default async function Login({ searchParams }: LoginProps) {
     return (
         <div className="flex flex-col justify-center items-center h-screen">
-            <Suspense fallback={<div>Loading...</div>}>
-                <LoginForm />
-            </Suspense>
+            <LoginForm callbackUrl={searchParams.callbackUrl} error={searchParams.error} />
         </div>
     )
 }