diff --git a/locator/topology.cc b/locator/topology.cc
index b6ffa83585..08457a0882 100644
--- a/locator/topology.cc
+++ b/locator/topology.cc
@@ -141,8 +141,11 @@ const node* topology::add_node(host_id id, const inet_address& ep, const endpoin
 }
 
 bool topology::is_configured_this_node(const node& n) const {
+    if (_cfg.this_host_id && n.host_id()) { // Selection by host_id
+        return _cfg.this_host_id == n.host_id();
+    }
     if (_cfg.this_endpoint != inet_address()) { // Selection by endpoint
-        return _cfg.this_endpoint == n.endpoint();;
+        return _cfg.this_endpoint == n.endpoint();
     }
     return false; // No selection;
 }