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 2b4d375..ebe14fe 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
@@ -272,6 +272,8 @@ public class EServiceManager extends ApplicationLifecycleHandler {
 							public void run() {
 								try {
 									String state = getState(lc);
+									String selectedToken = applicationContext.configuration().startTokens().toArray(new String[0])[0];
+									setContextFromToken(selectedToken);
 									createOrUpdateServiceStateFacet(state);
 								} catch (Exception e) {
 									logger.error("Cannot complete periodic update of EService", e);
@@ -401,15 +403,12 @@ public class EServiceManager extends ApplicationLifecycleHandler {
 
 
 	private void createOrUpdateServiceStateFacet(String state) throws ResourceRegistryException {
-
+		
 		ResourceRegistryPublisher resourceRegistryPublisher = ResourceRegistryPublisherFactory
 				.create();
-
-		String selectedToken = applicationContext.configuration().startTokens().toArray(new String[0])[0];
-		setContextFromToken(selectedToken);
+		
 		EService eService = getEService();
 
-
 		ServiceStateFacet serviceStateFacet = null;
 
 		List<ServiceStateFacet> serviceStateFacets = eService.getFacets(ServiceStateFacet.class);