diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientFactory.java b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientFactory.java
index 0e9ca63..c25d36a 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientFactory.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientFactory.java
@@ -101,7 +101,7 @@ protected static List<String> addresses;
 			address = FORCED_URL;
 		}else {
 		
-			if(addresses==null) {
+			if(addresses==null || addresses.isEmpty()) {
 				addresses = getAddresses();
 			}