diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
index 243f7f7..3e5b615 100644
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -1,5 +1,7 @@
 import LoginForm from "@/components/Auth/LoginForm";
 import Link from "next/link";
+import { createClient } from "@/utils/supabase/server";
+import { redirect } from "next/navigation";
 
 interface LoginPageProps {
   searchParams: Promise<{ redirectTo?: string }>;
@@ -8,6 +10,12 @@ interface LoginPageProps {
 export default async function LoginPage({ searchParams }: LoginPageProps) {
   const { redirectTo } = await searchParams;
 
+  const supabase = await createClient();
+  const { data: user } = await supabase.auth.getUser();
+  if (user) {
+    return redirect(redirectTo ? `/${redirectTo}` : "/account");
+  }
+
   return (
     <div className="mx-auto my-auto max-w-md w-full px-6 py-10">
       <div className="card p-6">
diff --git a/src/app/signup/page.tsx b/src/app/signup/page.tsx
index 7928ead..b5b91bf 100644
--- a/src/app/signup/page.tsx
+++ b/src/app/signup/page.tsx
@@ -1,3 +1,5 @@
+import { createClient } from "@/utils/supabase/server";
+import { redirect } from "next/navigation";
 import Link from "next/link";
 import SignupForm from "@/components/Auth/SignupForm";
 
@@ -8,6 +10,12 @@ interface SignupPageProps {
 export default async function SignupPage({ searchParams }: SignupPageProps) {
   const { redirectTo } = await searchParams;
 
+  const supabase = await createClient();
+  const { data: user } = await supabase.auth.getUser();
+  if (user) {
+    return redirect(redirectTo ? `/${redirectTo}` : "/account");
+  }
+
   return (
     <div className="mx-auto my-auto max-w-md w-full px-6 py-10">
       <div className="card p-6">