diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java
index c7dac725..f3b1d18d 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java
@@ -87,7 +87,7 @@ public class NoopDiscoveryClientAutoConfiguration implements
 				EmbeddedServletContainer container = ((EmbeddedWebApplicationContext) this.context)
 						.getEmbeddedServletContainer();
 				if (container != null) {
-					port = container.getPort();
+					port = port != 0 ? port : container.getPort();
 				}
 			}
 		}