diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java
index 8f9e77ed..09abaf26 100644
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java
+++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java
@@ -59,12 +59,14 @@ public class ConsulDiscoveryClientConfiguration {
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	//TODO: move to service-registry for Edgware
 	public HeartbeatProperties heartbeatProperties() {
 		return new HeartbeatProperties();
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	//TODO: Split appropriate values to service-registry for Edgware
 	@ConditionalOnMissingBean
 	public ConsulDiscoveryProperties consulDiscoveryProperties(InetUtils inetUtils) {