diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfiguration.java
index cef75dcd..350f22ec 100644
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfiguration.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfiguration.java
@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.web.HttpEncodingProperties;
 import org.springframework.boot.context.embedded.FilterRegistrationBean;
@@ -104,6 +105,12 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter {
 		return HasFeatures.namedFeature("Eureka Server", EurekaServerConfiguration.class);
 	}
 
+	@Bean
+	@ConditionalOnMissingBean
+	public EurekaServerConfig eurekaServerConfig() {
+		return new EurekaServerConfigBean();
+	}
+
 	//TODO: is there a better way?
 	@Bean(name = "spring.http.encoding.CONFIGURATION_PROPERTIES")
 	public HttpEncodingProperties httpEncodingProperties() {
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
index 2bbd47a8..07b045b1 100644
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
@@ -17,12 +17,8 @@
 package org.springframework.cloud.netflix.eureka.server;
 
 import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-
-import lombok.extern.apachecommons.CommonsLog;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.netflix.eureka.server.event.EurekaRegistryAvailableEvent;
 import org.springframework.cloud.netflix.eureka.server.event.EurekaServerStartedEvent;
 import org.springframework.context.ApplicationContext;
@@ -34,11 +30,12 @@ import org.springframework.web.context.ServletContextAware;
 
 import com.netflix.eureka.EurekaServerConfig;
 
+import lombok.extern.apachecommons.CommonsLog;
+
 /**
  * @author Dave Syer
  */
 @Configuration
-@EnableConfigurationProperties(EurekaServerConfigBean.class)
 @CommonsLog
 public class EurekaServerInitializerConfiguration
 		implements ServletContextAware, SmartLifecycle, Ordered {