diff --git a/src/app/machines/handshake/route.ts b/src/app/machines/handshake/route.ts
index 4f25be4..3a6521f 100644
--- a/src/app/machines/handshake/route.ts
+++ b/src/app/machines/handshake/route.ts
@@ -46,7 +46,14 @@ export async function GET(request: NextRequest) {
   const derivedOrigin = hostHeader
     ? `${forwardedProto ?? schemeFromUrl ?? "https"}://${hostHeader}`
     : null
-  const baseOrigin = env.NEXT_PUBLIC_APP_URL ?? derivedOrigin ?? request.nextUrl.origin
+  const configuredAppUrl = env.NEXT_PUBLIC_APP_URL?.trim()
+  const isLocalHost =
+    configuredAppUrl &&
+    (configuredAppUrl.includes("localhost") || configuredAppUrl.includes("127.0.0.1"))
+
+  // Se a APP_URL configurada é localhost, usar o host real do request para evitar redirecionar para 127.0.0.1 em produção.
+  const baseOrigin =
+    (!configuredAppUrl || isLocalHost) ? derivedOrigin ?? request.nextUrl.origin : configuredAppUrl
   const redirectUrl = new URL(redirectParam, baseOrigin)
 
   try {