diff --git a/app/signin/page.tsx b/app/signin/page.tsx
index 7fb44745..3a3a687b 100644
--- a/app/signin/page.tsx
+++ b/app/signin/page.tsx
@@ -8,10 +8,16 @@ export const metadata: Metadata = {
   title: "Enkun - Connexion",
 };
 
-export default async function SignIn() {
+export default async function SignIn({
+  searchParams,
+}: {
+  searchParams: { callbackUrl?: string };
+}) {
   const session = await getServerSession(authOptions);
 
-  if (session) {
+  // If user is already authenticated and there's no specific callback URL,
+  // redirect to the home page
+  if (session && !searchParams.callbackUrl) {
     redirect("/");
   }
 
@@ -25,7 +31,7 @@ export default async function SignIn() {
         backgroundRepeat: 'no-repeat'
       }}
     >
-      <SignInForm />
+      <SignInForm callbackUrl={searchParams.callbackUrl} />
     </div>
   );
 }
diff --git a/components/auth/signin-form.tsx b/components/auth/signin-form.tsx
index 0d7bc89f..a577b35f 100644
--- a/components/auth/signin-form.tsx
+++ b/components/auth/signin-form.tsx
@@ -1,18 +1,18 @@
 "use client";
 
 import { signIn } from "next-auth/react";
-import { useSearchParams } from "next/navigation";
 
-export function SignInForm() {
-  const searchParams = useSearchParams();
-  const callbackUrl = searchParams.get("callbackUrl") || "/";
+interface SignInFormProps {
+  callbackUrl?: string;
+}
 
+export function SignInForm({ callbackUrl }: SignInFormProps) {
   return (
     <div className="text-center">
       <h1 className="text-4xl font-bold text-white mb-4">Bienvenue sur Enkun</h1>
       <p className="text-white/80 mb-8">Connectez-vous pour accéder à votre espace</p>
       <button
-        onClick={() => signIn("keycloak", { callbackUrl })}
+        onClick={() => signIn("keycloak", { callbackUrl: callbackUrl || "/" })}
         className="px-8 py-3 bg-[#0F172A] text-white rounded hover:bg-[#1E293B] transition-colors"
       >
         Commit
diff --git a/middleware.ts b/middleware.ts
index 9bfb0fc6..a0b8055e 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -3,12 +3,23 @@ import { NextResponse } from "next/server";
 
 export default withAuth(
   function middleware(req) {
-    // Add custom middleware logic here if needed
+    // Allow access to the root path and signin page
+    if (req.nextUrl.pathname === "/" || req.nextUrl.pathname === "/signin") {
+      return NextResponse.next();
+    }
+
+    // For all other routes, check authentication
     return NextResponse.next();
   },
   {
     callbacks: {
-      authorized: ({ token }) => !!token,
+      authorized: ({ token, req }) => {
+        // Allow access to the root path and signin page
+        if (req.nextUrl.pathname === "/" || req.nextUrl.pathname === "/signin") {
+          return true;
+        }
+        return !!token;
+      },
     },
     pages: {
       signIn: "/signin",