diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
index d210986f..55d200dc 100644
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
+++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
@@ -93,7 +93,13 @@ public class EurekaClientAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(value = EurekaClientConfig.class, search = SearchStrategy.CURRENT)
 	public EurekaClientConfigBean eurekaClientConfigBean() {
-		return new EurekaClientConfigBean();
+		EurekaClientConfigBean client = new EurekaClientConfigBean();
+		if ("bootstrap".equals(this.env.getProperty("spring.config.name"))) {
+			// We don't register during bootstrap by default, but there will be another
+			// chance later.
+			client.setRegisterWithEureka(false);
+		}
+		return client;
 	}
 
 	@Bean