diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientFactory.java b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientFactory.java
index e51267e..77589d4 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientFactory.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientFactory.java
@@ -131,7 +131,7 @@ public class ResourceRegistryClientFactory {
 			address = FORCED_URL;
 		}else {
 		
-			if(addresses==null) {
+			if(addresses==null || addresses.isEmpty()) {
 				addresses = getAddresses();
 			}