diff --git a/src/main/java/org/gcube/smartgears/handlers/application/request/RequestContextRetriever.java b/src/main/java/org/gcube/smartgears/handlers/application/request/RequestContextRetriever.java
index 5860b5b..3565e7a 100644
--- a/src/main/java/org/gcube/smartgears/handlers/application/request/RequestContextRetriever.java
+++ b/src/main/java/org/gcube/smartgears/handlers/application/request/RequestContextRetriever.java
@@ -59,6 +59,7 @@ public class RequestContextRetriever extends RequestHandler {
 			}
 		}
 	
+		SecretManagerProvider.instance.reset();
 		SecretManager secretManager = SecretManagerProvider.instance.get();
 		
 		if (accessToken!=null) {
@@ -95,7 +96,7 @@ public class RequestContextRetriever extends RequestHandler {
 	@Override
 	public void handleResponse(ResponseEvent e) {
 		log.debug("resetting all the Thread local for this call.");
-		SecretManagerProvider.instance.get().reset();
+		SecretManagerProvider.instance.reset();
 	}
 	
 }