diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistration.java
index 97d762fb..a826567a 100644
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistration.java
+++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistration.java
@@ -80,6 +80,8 @@ public class ConsulAutoRegistration extends ConsulRegistration {
 
 		if (properties.getPort() != null) {
 			service.setPort(properties.getPort());
+			// we know the port and can set the check
+			setCheck(service, properties, context, heartbeatProperties);
 		}
 
 		return new ConsulAutoRegistration(service, properties, context, heartbeatProperties);
@@ -114,7 +116,7 @@ public class ConsulAutoRegistration extends ConsulRegistration {
 	}
 
 	public static void setCheck(NewService service, ConsulDiscoveryProperties properties, ApplicationContext context, HeartbeatProperties heartbeatProperties) {
-		if (properties.isRegisterHealthCheck()) {
+		if (properties.isRegisterHealthCheck() && service.getCheck() == null) {
 			Integer checkPort;
 			if (shouldRegisterManagement(properties, context)) {
 				checkPort = getManagementPort(properties, context);
diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java
new file mode 100644
index 00000000..ede0a2d3
--- /dev/null
+++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.consul.serviceregistry;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
+import org.springframework.cloud.consul.ConsulAutoConfiguration;
+import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.SocketUtils;
+
+import com.ecwid.consul.v1.agent.model.NewService;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
+
+/**
+ * @author Spencer Gibb
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.TestConfig.class,
+	properties = { "spring.application.name=myTestService-DiscoveryPort", },
+		webEnvironment = DEFINED_PORT)
+public class ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests {
+
+	@Autowired
+	private ConsulAutoRegistration registration;
+
+	@Autowired
+	private ConsulDiscoveryProperties properties;
+
+	@BeforeClass
+	public static void initClass() {
+		Integer port = SocketUtils.findAvailableTcpPort();
+		System.setProperty("spring.cloud.consul.discovery.port", port.toString());
+		System.setProperty("server.port", port.toString());
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		System.clearProperty("spring.cloud.consul.discovery.port");
+		System.clearProperty("server.port");
+	}
+
+	@Test
+	public void contextLoads() {
+		NewService service = this.registration.getService();
+		assertThat(service).as("service was null").isNotNull();
+		assertThat(service.getPort()).as("service port is 0").isGreaterThan(0);
+
+		NewService.Check check = service.getCheck();
+		assertThat(check).as("check was null").isNotNull();
+
+		String httpCheck = String.format("%s://%s:%s%s", properties.getScheme(),
+				properties.getHostname(), properties.getPort(),
+				properties.getHealthCheckPath());
+		assertThat(check.getHttp()).as("http check was wrong").isEqualTo(httpCheck);
+
+		// unable to call consul api to get health check details
+	}
+
+
+	@Configuration
+	@EnableAutoConfiguration
+	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, ConsulAutoServiceRegistrationAutoConfiguration.class })
+	public static class TestConfig { }
+}