diff --git a/clustering/server/src/main/java/org/wildfly/clustering/server/singleton/ServiceLifecycle.java b/clustering/server/src/main/java/org/wildfly/clustering/server/singleton/ServiceLifecycle.java
index <HASH>..<HASH> 100644
--- a/clustering/server/src/main/java/org/wildfly/clustering/server/singleton/ServiceLifecycle.java
+++ b/clustering/server/src/main/java/org/wildfly/clustering/server/singleton/ServiceLifecycle.java
@@ -80,16 +80,8 @@ public class ServiceLifecycle implements Lifecycle {
 
             monitor.awaitStability();
 
-            State state = this.controller.getState();
-            switch (state) {
-                case START_FAILED: {
-                    throw new IllegalStateException(this.controller.getStartException());
-                }
-                default: {
-                    if (state != targetState) {
-                        throw new IllegalStateException(state.toString());
-                    }
-                }
+            if (this.controller.getState() == ServiceController.State.START_FAILED) {
+                throw new IllegalStateException(this.controller.getStartException());
             }
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
Ignore service state transition failures due to removed services.