diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java
index d96ffdae514..4a381d628a3 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java
@@ -21,11 +21,15 @@ import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfi
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextType;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
 import org.springframework.boot.web.servlet.error.ErrorAttributes;
+import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter;
 import org.springframework.context.annotation.Bean;
+import org.springframework.web.context.request.RequestContextListener;
+import org.springframework.web.filter.RequestContextFilter;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
@@ -81,4 +85,11 @@ class WebMvcEndpointChildContextConfiguration {
 		return new CompositeHandlerExceptionResolver();
 	}
 
+	@Bean
+	@ConditionalOnMissingBean({ RequestContextListener.class,
+			RequestContextFilter.class })
+	public RequestContextFilter requestContextFilter() {
+		return new OrderedRequestContextFilter();
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java
new file mode 100644
index 00000000000..8006968762a
--- /dev/null
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2012-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.autoconfigure.web.servlet;
+
+import org.junit.Test;
+
+import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.context.request.RequestContextListener;
+import org.springframework.web.filter.RequestContextFilter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link WebMvcEndpointChildContextConfiguration}.
+ *
+ * @author Madhura Bhave
+ */
+public class WebMvcEndpointChildContextConfigurationTests {
+
+	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner();
+
+	@Test
+	public void contextShouldConfigureRequestContextFilter() {
+		this.contextRunner
+				.withUserConfiguration(WebMvcEndpointChildContextConfiguration.class)
+				.run(context -> assertThat(context).hasSingleBean(OrderedRequestContextFilter.class));
+	}
+
+	@Test
+	public void contextShouldNotConfigureRequestContextFilterWhenPresent() {
+		this.contextRunner
+				.withUserConfiguration(ExistingConfig.class, WebMvcEndpointChildContextConfiguration.class)
+				.run(context -> {
+					assertThat(context).hasSingleBean(RequestContextFilter.class);
+					assertThat(context).hasBean("testRequestContextFilter");
+				});
+	}
+
+	@Test
+	public void contextShouldNotConfigureRequestContextFilterWhenRequestContextListenerPresent() {
+		this.contextRunner
+				.withUserConfiguration(RequestContextListenerConfig.class,
+						WebMvcEndpointChildContextConfiguration.class)
+				.run(context -> {
+					assertThat(context).hasSingleBean(RequestContextListener.class);
+					assertThat(context).doesNotHaveBean(OrderedRequestContextFilter.class);
+				});
+	}
+
+	static class ExistingConfig {
+
+		@Bean
+		public RequestContextFilter testRequestContextFilter() {
+			return new RequestContextFilter();
+		}
+
+	}
+
+	static class RequestContextListenerConfig {
+
+		@Bean
+		public RequestContextListener testRequestContextListener() {
+			return new RequestContextListener();
+		}
+
+	}
+
+}