diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfiguration.java
index 8ea5d5e6..95fdd1ee 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfiguration.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfiguration.java
@@ -57,6 +57,7 @@ public class ConfigServiceBootstrapConfiguration {
 		return locator;
 	}
 
+	@ConditionalOnProperty(value = "spring.cloud.config.failFast", matchIfMissing=false)
 	@ConditionalOnClass({ Retryable.class, Aspect.class, AopAutoConfiguration.class })
 	@Configuration
 	@EnableRetry(proxyTargetClass = true)