diff --git a/containers/ecr-viewer/src/middleware.ts b/containers/ecr-viewer/src/middleware.ts
index 5aa958fc5d..4a8d2af52e 100644
--- a/containers/ecr-viewer/src/middleware.ts
+++ b/containers/ecr-viewer/src/middleware.ts
@@ -48,10 +48,15 @@ export const config = {
  *   "auth" parameter does not exist in the request.
  */
 function set_auth_cookie(req: NextRequest) {
-  const url = req.nextUrl;
+  const url = req.nextUrl.clone();
   const auth = url.searchParams.get("auth");
+  console.log(url);
+  console.log("==========");
+  console.log(req);
+  console.log("------");
   if (auth) {
     url.searchParams.delete("auth");
+    url.hostname = req.headers.get("x-forwarded-host") ?? url.hostname;
     const response = NextResponse.redirect(url);
     response.cookies.set("auth-token", auth, { httpOnly: true });
     return response;