diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java
index 4895c9b4..5a816f21 100644
--- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java
+++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java
@@ -109,9 +109,8 @@ public class XForwardedRemoteAddressResolver implements RemoteAddressResolver {
 	@Override
 	public InetSocketAddress resolve(ServerWebExchange exchange) {
 		List<String> xForwardedValues = extractXForwardedValues(exchange);
-		Collections.reverse(xForwardedValues);
 		if (!xForwardedValues.isEmpty()) {
-			int index = Math.min(xForwardedValues.size(), maxTrustedIndex) - 1;
+			int index = Math.max(0, xForwardedValues.size() - maxTrustedIndex);
 			return new InetSocketAddress(xForwardedValues.get(index), 0);
 		}
 		return defaultRemoteIpResolver.resolve(exchange);