diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/DefaultClientResponse.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/DefaultClientResponse.java
index c215e9d2..6257e58e 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/DefaultClientResponse.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/DefaultClientResponse.java
@@ -136,6 +136,11 @@ public class DefaultClientResponse implements ClientResponse {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
+	public String logPrefix() {
+		return "";
+	}
+
 	@SuppressWarnings("unchecked")
 	private <T> Mono<T> consumeAndCancel() {
 		return (Mono<T>) this.response.getBody().map(buffer -> {
diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/DefaultServerRequest.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/DefaultServerRequest.java
index 22bd0c3d..4369bf16 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/DefaultServerRequest.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/DefaultServerRequest.java
@@ -127,7 +127,12 @@ public class DefaultServerRequest implements ServerRequest {
 
 	@Override
 	public Optional<InetSocketAddress> remoteAddress() {
-		return Optional.of(request().getRemoteAddress());
+		return Optional.ofNullable(request().getRemoteAddress());
+	}
+
+	@Override
+	public Optional<InetSocketAddress> localAddress() {
+		return Optional.ofNullable(request().getLocalAddress());
 	}
 
 	@Override