diff --git a/include/Host.h b/include/Host.h
index e3d9db4a76..3391718265 100644
--- a/include/Host.h
+++ b/include/Host.h
@@ -103,7 +103,7 @@ class Host : public GenericHashEntry, public AlertableEntity {
   virtual bool isLocalHost()  const = 0;
   virtual bool isSystemHost() const = 0;
   inline  bool isBroadcastDomainHost() const { return(is_in_broadcast_domain); };
-  inline  bool serializeByMac() const { return((isBroadcastDomainHost() || isDhcpHost()) && iface->serializeLbdHostsAsMacs()); }
+  inline  bool serializeByMac()        const { return(isLocalHost() && iface->serializeLbdHostsAsMacs()); }
   inline  bool isDhcpHost()            const { return(is_dhcp_host); };
   inline  void setBroadcastDomainHost()      { is_in_broadcast_domain = true;  };
   inline  void setSystemHost()               { /* TODO: remove */              };
diff --git a/src/Host.cpp b/src/Host.cpp
index 87c54e2a71..a03eb53023 100644
--- a/src/Host.cpp
+++ b/src/Host.cpp
@@ -1473,10 +1473,10 @@ char* Host::get_tskey(char *buf, size_t bufsize) {
   char *k;
   Mac *cur_mac = getMac(); /* Cache macs as they can be swapped/updated */
 
-  if(serializeByMac()) {
+  if(serializeByMac())
     k = get_mac_based_tskey(cur_mac, buf, bufsize);
-  } else
+  else
     k = get_hostkey(buf, bufsize);
-
+  
   return(k);
 }