diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
index 0ae2da5..02ab45b 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
@@ -188,7 +188,7 @@ public class EServiceManager {
 
 		return eService;
 	}
-
+	
 	public EService createEService() throws ResourceRegistryException {
 		ResourceRegistryClient resourceRegistryClient = ResourceRegistryClientFactory.create();
 		UUID eServiceUUID = UUID.fromString(applicationContext.id());
@@ -208,7 +208,7 @@ public class EServiceManager {
 		} catch (NotFoundException e) {
 			eService = instantiateEService();
 			createActivatesRelation(eService);
-			
+			serviceStateFacet = eService.getFacets(ServiceStateFacet.class).get(0);
 		} catch (AvailableInAnotherContextException e) {
 			addToContext();
 			try {
@@ -256,6 +256,7 @@ public class EServiceManager {
 
 		try {
 			activates = resourceRegistryPublisher.createIsRelatedTo(activates);
+			this.eService = activates.getTarget();
 		} catch (NotFoundException e) {
 			logger.error("THIS IS REALLY STRANGE. YOU SHOULD NE BE HERE. Error while creating {}.", activates, e);
 			throw e;