diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
index c8d7fb0e13f..7cebbd4af32 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -220,7 +220,9 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 
 	@Override
 	public InetSocketAddress getRemoteAddress() {
-		return new InetSocketAddress(this.servletRequest.getRemoteAddr(), this.servletRequest.getRemotePort());
+		String addressOrHost = this.servletRequest.getRemoteAddr();
+		addressOrHost = (addressOrHost != null ? addressOrHost : this.servletRequest.getRemoteHost());
+		return new InetSocketAddress(addressOrHost, this.servletRequest.getRemotePort());
 	}
 
 	@Override