diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientFactory.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientFactory.java
index 2637516..053315b 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientFactory.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientFactory.java
@@ -101,7 +101,7 @@ public class ResourceRegistryContextClientFactory {
 			address = FORCED_URL;
 		}else {
 		
-			if(addresses==null) {
+			if(addresses==null || addresses.isEmpty()) {
 				addresses = getAddresses();
 			}