diff --git a/docs/src/main/asciidoc/spring-cloud-circuitbreaker-hystrix.adoc b/docs/src/main/asciidoc/spring-cloud-circuitbreaker-hystrix.adoc
index 19245f6dc..714f195e5 100644
--- a/docs/src/main/asciidoc/spring-cloud-circuitbreaker-hystrix.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-circuitbreaker-hystrix.adoc
@@ -1,4 +1,8 @@
 include::_attributes.adoc[]
+=== Disabling Spring Cloud Circuit Breaker Hystrix
+
+You can disable the auto-configuration by setting `spring.cloud.circuitbreaker.hystrix.enabled`
+to `false`.
 
 === Configuring Hystrix Circuit Breakers
 
diff --git a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerAutoConfiguration.java b/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerAutoConfiguration.java
index 1ac706549..653cc6d90 100644
--- a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerAutoConfiguration.java
+++ b/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerAutoConfiguration.java
@@ -26,6 +26,7 @@ import com.netflix.hystrix.Hystrix;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.cloud.client.circuitbreaker.Customizer;
 import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreakerFactory;
@@ -37,6 +38,8 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 @ConditionalOnClass({ Hystrix.class })
+@ConditionalOnProperty(name = "spring.cloud.circuitbreaker.hystrix.enabled",
+		matchIfMissing = true)
 public class HystrixCircuitBreakerAutoConfiguration {
 
 	@Bean