diff --git a/src/main/java/org/gcube/common/authorization/utils/manager/SecretManagerProvider.java b/src/main/java/org/gcube/common/authorization/utils/manager/SecretManagerProvider.java
index 64f0e85..42cc309 100644
--- a/src/main/java/org/gcube/common/authorization/utils/manager/SecretManagerProvider.java
+++ b/src/main/java/org/gcube/common/authorization/utils/manager/SecretManagerProvider.java
@@ -30,7 +30,9 @@ public class SecretManagerProvider {
 	
 	public void reset(){
 		SecretManager secretManager = thread.get();
-		secretManager.reset();
+		if(secretManager!=null) {
+			secretManager.reset();
+		}
 		thread.remove();
 	}