diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java
index b5dc4908..e3e997b3 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java
@@ -175,13 +175,12 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle,
 
 	@Override
 	public void stop() {
-		if (isEnabled()) {
+		if (this.running.compareAndSet(true, false) && isEnabled()) {
 			deregister();
 			if (shouldRegisterManagement()) {
 				deregisterManagement();
 			}
 		}
-		this.running.compareAndSet(true, false);
 	}
 
 	@PreDestroy