diff --git a/src/middleware.ts b/src/middleware.ts
index 1769470..f1be42e 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -52,7 +52,9 @@ export function middleware(request: NextRequest) {
 
   // Redirect logged-in users away from login page
   if (isAuthPage && isLoggedIn) {
-    return NextResponse.redirect(new URL("/dashboard", request.url));
+    const url = request.nextUrl.clone();
+    url.pathname = "/dashboard";
+    return NextResponse.redirect(url);
   }
 
   // Allow authenticated users to access the pending page
@@ -65,7 +67,9 @@ export function middleware(request: NextRequest) {
     if (pathname.startsWith("/api/")) {
       return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
     }
-    return NextResponse.redirect(new URL("/login", request.url));
+    const url = request.nextUrl.clone();
+    url.pathname = "/login";
+    return NextResponse.redirect(url);
   }
 
   return NextResponse.next();