diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
index 840d285..5c78a81 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
@@ -579,7 +579,11 @@ public class EServiceManager extends ApplicationLifecycleHandler {
 
 	@SuppressWarnings("unchecked")
 	private void createOrUpdateServiceStateFacet(EService eService, String state) throws ResourceRegistryException {
-
+		String previousToken = SecurityTokenProvider.instance.get();
+		if (previousToken == null) {
+			setContextFromToken((String) applicationContext.configuration().startTokens().toArray()[0]);
+		}
+		
 		ClassLoader contextCL = Thread.currentThread().getContextClassLoader();
 		Thread.currentThread().setContextClassLoader(EServiceManager.class.getClassLoader());