diff --git a/auth/middleware.go b/auth/middleware.go
index e183059294c9047ef8f86ebf057bb03f2376b5ad..23ed0de4b45e5e0efb716f91f29f683093127e2a 100644
--- a/auth/middleware.go
+++ b/auth/middleware.go
@@ -299,7 +299,7 @@
 	auth.InternalAuth = internalAuth
 	auth.Grants, _ = DecodeGrants(r.Context(), "")
 
-	auth.IPAddress = r.RemoteAddr
+	auth.IPAddress = host
 	var route []string
 	for _, val := range r.Header.Values("X-Forwarded-For") {
 		route = append(route, strings.Split(val, ",")...)
@@ -309,10 +309,10 @@ 		ip := net.ParseIP(val)
 		if ip == nil {
 			continue
 		}
+		auth.IPAddress = ip.String()
 		if ip.IsPrivate() {
 			continue
 		}
-		auth.IPAddress = ip.String()
 		break
 	}