diff --git a/include/hubloc.php b/include/hubloc.php
index da17f41d0..bebbd041c 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -129,12 +129,12 @@ function check_hublocs()
     $interval = Config::Get('system', 'delivery_interval', 2);
 
     $wrong_urls = q(
-        "select hubloc_id from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s'",
+        "select hubloc_id from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s' and hubloc_network in ('zot6', 'nomad')",
         dbesc($sitekey),
         dbesc(z_root())
     );
     $wrong_keys = q(
-        "select hubloc_id from hubloc where hubloc_sitekey != '%s' and hubloc_url = '%s'",
+        "select hubloc_id from hubloc where hubloc_sitekey != '%s' and hubloc_url = '%s' and hubloc_network in ('zot6', 'nomad')",
         dbesc($sitekey),
         dbesc(z_root())
     );