diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java
index d65e1b13..334f1d7e 100644
--- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java
+++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java
@@ -56,21 +56,17 @@ public class ConsulAutoConfiguration {
 
 	@Configuration
 	@ConditionalOnClass(Endpoint.class)
-	@ConditionalOnBean(ConsulClient.class)
 	protected static class ConsulHealthConfig {
 
-		@Autowired
-		private ConsulClient consulClient;
-
 		@Bean
 		@ConditionalOnMissingBean
-		public ConsulEndpoint consulEndpoint() {
+		public ConsulEndpoint consulEndpoint(ConsulClient consulClient) {
 			return new ConsulEndpoint(consulClient);
 		}
 
 		@Bean
 		@ConditionalOnMissingBean
-		public ConsulHealthIndicator consulHealthIndicator() {
+		public ConsulHealthIndicator consulHealthIndicator(ConsulClient consulClient) {
 			return new ConsulHealthIndicator(consulClient);
 		}
 	}