diff --git a/src/main/java/net/geant/nmaas/orchestration/entities/AppDeploymentState.java b/src/main/java/net/geant/nmaas/orchestration/entities/AppDeploymentState.java
index 2b06341a867e8e835c68e17e8f473187af3339fb..0c7ba812fb2f26c9ddd5fc339a2579fa680dc838 100644
--- a/src/main/java/net/geant/nmaas/orchestration/entities/AppDeploymentState.java
+++ b/src/main/java/net/geant/nmaas/orchestration/entities/AppDeploymentState.java
@@ -551,12 +551,8 @@ public enum AppDeploymentState {
         @Override
         public AppDeploymentState nextState(NmServiceDeploymentState state) {
             //TODO discous about correct next state
-            return APPLICATION_CONFIGURED;
-        }
-
-        @Override
-        public boolean isInRunningState() {
-            return true;
+//            return APPLICATION_CONFIGURED;
+            return nextStateForNotMatchingNmServiceDeploymentState(this, state);
         }
     };