diff --git a/orca-web/src/main/groovy/com/netflix/spinnaker/orca/web/config/WebConfiguration.groovy b/orca-web/src/main/groovy/com/netflix/spinnaker/orca/web/config/WebConfiguration.groovy
index 81a71b71a2..402b028430 100644
--- a/orca-web/src/main/groovy/com/netflix/spinnaker/orca/web/config/WebConfiguration.groovy
+++ b/orca-web/src/main/groovy/com/netflix/spinnaker/orca/web/config/WebConfiguration.groovy
@@ -16,6 +16,8 @@
 
 package com.netflix.spinnaker.orca.web.config
 
+import groovy.util.logging.Slf4j
+
 import javax.servlet.Filter
 import javax.servlet.FilterChain
 import javax.servlet.FilterConfig
@@ -44,19 +46,22 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 @ComponentScan(['com.netflix.spinnaker.orca.controllers', 'com.netflix.spinnaker.orca.util'])
 @CompileStatic
 @EnableFiatAutoConfig
-class WebConfiguration implements WebMvcConfigurer {
-
-  @Autowired
-  Registry registry
+@Slf4j
+class WebConfiguration {
 
   @Bean
-  MetricsInterceptor metricsInterceptor() {
-    return  new MetricsInterceptor(this.registry, "controller.invocations", ["application"], ["BasicErrorController"])
+  MetricsInterceptor metricsInterceptor(Registry registry) {
+    return  new MetricsInterceptor(registry, "controller.invocations", ["application"], ["BasicErrorController"])
   }
 
-  @Override
-  public void addInterceptors(InterceptorRegistry registry) {
-    registry.addInterceptor(metricsInterceptor())
+  @Bean
+  WebMvcConfigurer webMvcConfigurer(MetricsInterceptor metricsInterceptor) {
+    return new WebMvcConfigurer() {
+      @Override
+      void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(metricsInterceptor)
+      }
+    }
   }
 
   @Bean(name = "objectMapper", autowire = Autowire.BY_TYPE) ObjectMapper orcaObjectMapper() {