diff --git a/pylgbst/comms/cgatt.py b/pylgbst/comms/cgatt.py
index 4ac47bb..b897af4 100644
--- a/pylgbst/comms/cgatt.py
+++ b/pylgbst/comms/cgatt.py
@@ -100,7 +100,7 @@ class GattConnection(Connection):
             for dev in devices:
                 address = dev.mac_address
                 name = dev.alias()
-                if name == LEGO_MOVE_HUB or hub_mac == address:
+                if (not hub_mac and name == LEGO_MOVE_HUB) or hub_mac == address:
                     logging.info("Found %s at %s", name, address)
                     self._device = CustomDevice(address, self._manager)
                     break
diff --git a/pylgbst/comms/cgattlib.py b/pylgbst/comms/cgattlib.py
index 56b8f51..c515ced 100644
--- a/pylgbst/comms/cgattlib.py
+++ b/pylgbst/comms/cgattlib.py
@@ -70,7 +70,7 @@ class GattLibConnection(Connection):
             log.debug("Devices: %s", devices)
 
             for address, name in devices.items():
-                if name == LEGO_MOVE_HUB or hub_mac == address:
+                if (not hub_mac and name == LEGO_MOVE_HUB) or hub_mac == address:
                     logging.info("Found %s at %s", name, address)
                     self.requester = Requester(address, True, self._iface)
                     break
diff --git a/pylgbst/comms/cpygatt.py b/pylgbst/comms/cpygatt.py
index 1c412b8..661a2ce 100644
--- a/pylgbst/comms/cpygatt.py
+++ b/pylgbst/comms/cpygatt.py
@@ -34,7 +34,7 @@ class GattoolConnection(Connection):
             for dev in devices:
                 address = dev['address']
                 name = dev['name']
-                if name == LEGO_MOVE_HUB or hub_mac == address:
+                if (not hub_mac and name == LEGO_MOVE_HUB) or hub_mac == address:
                     logging.info("Found %s at %s", name, address)
                     self._conn_hnd = adapter.connect(address)
                     break