diff --git a/spring-boot-project/spring-boot-metrics/src/main/java/org/springframework/boot/metrics/autoconfigure/MetricsEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-metrics/src/main/java/org/springframework/boot/metrics/autoconfigure/MetricsEndpointAutoConfiguration.java
index 9444eeba05..9c5b6d8336 100644
--- a/spring-boot-project/spring-boot-metrics/src/main/java/org/springframework/boot/metrics/autoconfigure/MetricsEndpointAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-metrics/src/main/java/org/springframework/boot/metrics/autoconfigure/MetricsEndpointAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean;
  * @since 4.0.0
  */
 @AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
-@ConditionalOnClass(Timed.class)
+@ConditionalOnClass({ ConditionalOnAvailableEndpoint.class, Timed.class })
 @ConditionalOnAvailableEndpoint(MetricsEndpoint.class)
 public class MetricsEndpointAutoConfiguration {