diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
index 8db01ff0..e277b0c2 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
@@ -65,7 +65,7 @@ public class CommonsClientAutoConfiguration {
 
 		@Bean
 		@ConditionalOnProperty(value = "spring.cloud.discovery.client.composite-indicator.enabled", matchIfMissing = true)
-		@ConditionalOnBean(DiscoveryHealthIndicator.class)
+		@ConditionalOnBean({ DiscoveryHealthIndicator.class, HealthAggregator.class })
 		public DiscoveryCompositeHealthIndicator discoveryCompositeHealthIndicator(
 				HealthAggregator aggregator, List<DiscoveryHealthIndicator> indicators) {
 			return new DiscoveryCompositeHealthIndicator(aggregator, indicators);