diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java
index 1a0edf4e8af..8fb4ba636ba 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java
@@ -188,7 +188,7 @@ public class TomcatWebServerFactoryCustomizer
 			// addresses
 			valve.setInternalProxies(remoteIpProperties.getInternalProxies());
 			try {
-				valve.setHostHeader(tomcatProperties.getHostHeader());
+				valve.setHostHeader(remoteIpProperties.getHostHeader());
 			}
 			catch (NoSuchMethodError ex) {
 				// Avoid failure with war deployments to Tomcat 8.5 before 8.5.44 and