diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java
index 10a6987..3e79aa8 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java
@@ -83,7 +83,7 @@ public class ContextCache {
 	
 	public void refreshContextsIfNeeded() throws ResourceRegistryException {
 		Calendar now = Calendar.getInstance();
-		if(now.after(expiringTime) || (contexts==null && contextCacheRenewal!=null)) {
+		if((now.after(expiringTime) || (contexts==null)) && contextCacheRenewal!=null) {
 			try {
 				List<Context> contexts = contextCacheRenewal.renew();
 				singleton.cleanCache(now);