2 files changed, 7 insertions, 1 deletions
diff --git a/registry/registry.c b/registry/registry.c
index 67e179a3a9..aaa448c517 100644
--- a/registry/registry.c
+++ b/registry/registry.c
@@ -81,6 +81,8 @@ static int registry_json_person_url_callback(void *entry, void *data) {
     struct registry_json_walk_person_urls_callback *c = (struct registry_json_walk_person_urls_callback *)data;
     struct web_client *w = c->w;
 
+    if (!strcmp(pu->url->url,"***")) return 0;
+    
     if(unlikely(c->count++))
         buffer_strcat(w->response.data, ",");
 
@@ -97,6 +99,8 @@ static int registry_json_machine_url_callback(void *entry, void *data) {
     struct web_client *w = c->w;
     REGISTRY_MACHINE *m = c->m;
 
+    if (!strcmp(mu->url->url,"***")) return 1;
+
     if(unlikely(c->count++))
         buffer_strcat(w->response.data, ",");
 
diff --git a/registry/registry_init.c b/registry/registry_init.c
index b8af0ad869..3cf140deeb 100644
--- a/registry/registry_init.c
+++ b/registry/registry_init.c
@@ -37,10 +37,12 @@ int registry_init(void) {
     registry.persons_expiration = config_get_number(CONFIG_SECTION_REGISTRY, "registry expire idle persons days", 365) * 86400;
     registry.registry_domain = config_get(CONFIG_SECTION_REGISTRY, "registry domain", "");
     registry.registry_to_announce = config_get(CONFIG_SECTION_REGISTRY, "registry to announce", "https://registry.my-netdata.io");
-    registry.cloud_base_url = config_get(CONFIG_SECTION_CLOUD, "cloud base url", "https://netdata.cloud");
     registry.hostname = config_get(CONFIG_SECTION_REGISTRY, "registry hostname", netdata_configured_hostname);
     registry.verify_cookies_redirects = config_get_boolean(CONFIG_SECTION_REGISTRY, "verify browser cookies support", 1);
 
+    // netdata.cloud configuration, if cloud_base_url == "", cloud functionality is disabled.
+    registry.cloud_base_url = config_get(CONFIG_SECTION_CLOUD, "cloud base url", "https://netdata.cloud");
+
     setenv("NETDATA_REGISTRY_HOSTNAME", registry.hostname, 1);
     setenv("NETDATA_REGISTRY_URL", registry.registry_to_announce, 1);