diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/availability/ApplicationAvailabilityAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/availability/ApplicationAvailabilityAutoConfiguration.java
index 769c5a3cc8a..e9e19df7f00 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/availability/ApplicationAvailabilityAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/availability/ApplicationAvailabilityAutoConfiguration.java
@@ -34,8 +34,8 @@ import org.springframework.context.annotation.Bean;
 public class ApplicationAvailabilityAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean
-	public ApplicationAvailability applicationAvailability() {
+	@ConditionalOnMissingBean(ApplicationAvailability.class)
+	public ApplicationAvailabilityBean applicationAvailability() {
 		return new ApplicationAvailabilityBean();
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/availability/ApplicationAvailabilityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/availability/ApplicationAvailabilityAutoConfigurationTests.java
index 225ce98f5eb..c18b0bd01d5 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/availability/ApplicationAvailabilityAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/availability/ApplicationAvailabilityAutoConfigurationTests.java
@@ -18,8 +18,11 @@ package org.springframework.boot.autoconfigure.availability;
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.LazyInitializationBeanFactoryPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.availability.ApplicationAvailability;
+import org.springframework.boot.availability.AvailabilityChangeEvent;
+import org.springframework.boot.availability.ReadinessState;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -51,4 +54,13 @@ class ApplicationAvailabilityAutoConfigurationTests {
 				.hasBean("customApplicationAvailability")));
 	}
 
+	@Test
+	void whenLazyInitializationIsEnabledApplicationAvailabilityBeanShouldStillReceiveAvailabilityChangeEvents() {
+		this.contextRunner.withBean(LazyInitializationBeanFactoryPostProcessor.class).run((context) -> {
+			AvailabilityChangeEvent.publish(context, ReadinessState.ACCEPTING_TRAFFIC);
+			ApplicationAvailability applicationAvailability = context.getBean(ApplicationAvailability.class);
+			assertThat(applicationAvailability.getLastChangeEvent(ReadinessState.class)).isNotNull();
+		});
+	}
+
 }