diff --git a/electrum/interface.py b/electrum/interface.py
index 63af79876..b642d64b4 100644
--- a/electrum/interface.py
+++ b/electrum/interface.py
@@ -628,7 +628,10 @@ class Interface(PrintError):
         def do_bucket():
             if self.is_tor():
                 return BUCKET_NAME_OF_ONION_SERVERS
-            ip_addr = ip_address(self.ip_addr())
+            try:
+                ip_addr = ip_address(self.ip_addr())
+            except ValueError:
+                return ''
             if not ip_addr:
                 return ''
             if ip_addr.version == 4:
diff --git a/electrum/network.py b/electrum/network.py
index ed5892af9..f03241b08 100644
--- a/electrum/network.py
+++ b/electrum/network.py
@@ -760,6 +760,8 @@ class Network(PrintError):
         # main interface is exempt. this makes switching servers easier
         if iface_to_check.is_main_server():
             return True
+        if not iface_to_check.bucket_based_on_ipaddress():
+            return True
         # bucket connected interfaces
         with self.interfaces_lock:
             interfaces = list(self.interfaces.values())