diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 16071a0a386..7305b448fe1 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -143,7 +143,7 @@
 		<quartz.version>2.3.0</quartz.version>
 		<querydsl.version>4.2.1</querydsl.version>
 		<rabbit-amqp-client.version>5.4.1</rabbit-amqp-client.version>
-		<reactor-bom.version>Californium-RC1</reactor-bom.version>
+		<reactor-bom.version>Californium-BUILD-SNAPSHOT</reactor-bom.version>
 		<rest-assured.version>3.1.1</rest-assured.version>
 		<reactive-streams.version>1.0.2</reactive-streams.version>
 		<rxjava.version>1.3.8</rxjava.version>
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java
index 0bafb6eabaa..0e020556ffb 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java
@@ -123,7 +123,7 @@ public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFact
 			server = compressionCustomizer.apply(server);
 		}
 		server = server.protocol(listProtocols());
-		server = (this.useForwardHeaders ? server.forwarded() : server.noForwarded());
+		server = server.forwarded(this.useForwardHeaders);
 		return applyCustomizers(server);
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
index 536c7ae033d..bc1d9ca2454 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
@@ -307,7 +307,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
 				.getWebServer(new CharsHandler(3000, MediaType.TEXT_PLAIN));
 		this.webServer.start();
 
-		HttpClient client = HttpClient.create().wiretap().compress().tcpConfiguration(
+		HttpClient client = HttpClient.create().wiretap().compress(true).tcpConfiguration(
 				(tcpClient) -> tcpClient.doOnConnected((connection) -> connection
 						.channel().pipeline().addBefore(NettyPipeline.HttpDecompressor,
 								"CompressionTest", new CompressionDetectionHandler())));