diff --git a/spring-boot-admin-server-cloud/src/main/java/de/codecentric/boot/admin/server/cloud/config/AdminServerDiscoveryAutoConfiguration.java b/spring-boot-admin-server-cloud/src/main/java/de/codecentric/boot/admin/server/cloud/config/AdminServerDiscoveryAutoConfiguration.java
index f4c4ba623a0..c22079fd6b4 100644
--- a/spring-boot-admin-server-cloud/src/main/java/de/codecentric/boot/admin/server/cloud/config/AdminServerDiscoveryAutoConfiguration.java
+++ b/spring-boot-admin-server-cloud/src/main/java/de/codecentric/boot/admin/server/cloud/config/AdminServerDiscoveryAutoConfiguration.java
@@ -80,6 +80,7 @@ public EurekaServiceInstanceConverter serviceInstanceConverter() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnBean(KubernetesDiscoveryProperties.class)
 	@ConditionalOnMissingBean({ ServiceInstanceConverter.class })
 	@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
 	public static class KubernetesConverterConfiguration {
diff --git a/spring-boot-admin-server-cloud/src/test/java/de/codecentric/boot/admin/server/cloud/config/AdminServerDiscoveryAutoConfigurationTest.java b/spring-boot-admin-server-cloud/src/test/java/de/codecentric/boot/admin/server/cloud/config/AdminServerDiscoveryAutoConfigurationTest.java
index 33c91522122..56ab35351de 100644
--- a/spring-boot-admin-server-cloud/src/test/java/de/codecentric/boot/admin/server/cloud/config/AdminServerDiscoveryAutoConfigurationTest.java
+++ b/spring-boot-admin-server-cloud/src/test/java/de/codecentric/boot/admin/server/cloud/config/AdminServerDiscoveryAutoConfigurationTest.java
@@ -19,7 +19,6 @@
 import com.netflix.discovery.EurekaClient;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.http.client.autoconfigure.reactive.ReactiveHttpClientAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.webclient.autoconfigure.WebClientAutoConfiguration;
@@ -65,8 +64,8 @@ void eurekaServiceInstanceConverter() {
 
 	@Test
 	void kubernetesServiceInstanceConverter() {
-		this.contextRunner.withUserConfiguration(KubernetesDiscoveryPropertiesConfiguration.class)
-			.withBean(DiscoveryClient.class, () -> mock(DiscoveryClient.class))
+		this.contextRunner.withBean(DiscoveryClient.class, () -> mock(DiscoveryClient.class))
+			.withBean(KubernetesDiscoveryProperties.class, () -> mock(KubernetesDiscoveryProperties.class))
 			.withPropertyValues("spring.main.cloud-platform=KUBERNETES")
 			.run((context) -> assertThat(context.getBean(ServiceInstanceConverter.class))
 				.isInstanceOf(KubernetesServiceInstanceConverter.class));
@@ -89,9 +88,4 @@ public Registration convert(ServiceInstance instance) {
 
 	}
 
-	@EnableConfigurationProperties(KubernetesDiscoveryProperties.class)
-	public static class KubernetesDiscoveryPropertiesConfiguration {
-
-	}
-
 }