diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java
index 3af0f2b4..67c2d65b 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java
@@ -23,6 +23,8 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.bootstrap.BootstrapApplicationListener;
@@ -116,6 +118,16 @@ public class PropertySourceBootstrapConfiguration implements
 			return locator;
 		}
 
+	}
+
+	@Configuration
+	@ConditionalOnClass(HealthIndicator.class)
+    @ConditionalOnExpression("${spring.cloud.config.enabled:true}")
+	protected static class ConfigServerHealthIndicatorConfiguration {
+
+		@Autowired
+		private ConfigurableEnvironment environment;
+
         @Bean
         public ConfigServerHealthIndicator configServerHealthIndicator(ConfigServicePropertySourceLocator locator) {
             return new ConfigServerHealthIndicator(environment, locator);