diff --git a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
index 8b0a6c3..636e85c 100644
--- a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
+++ b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
@@ -189,7 +189,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
 
 		String methodPath = "/token/node"; 
 
-		int infrastructureHash = Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get(), endpoints.getDefaultInfrastructure());
+		int infrastructureHash = Utils.getInfrastructureHashfromContext(context);
 		
 		StringBuilder callUrl;