diff --git a/src/bbf_plugin/hosts.c b/src/bbf_plugin/hosts.c
index e0e760251aa875e53f293a9a4c0087d37a8bb146..681922897945b7f769699715cf54a75180a1bc5f 100644
--- a/src/bbf_plugin/hosts.c
+++ b/src/bbf_plugin/hosts.c
@@ -203,11 +203,10 @@ static int get_HostsHost_AssociatedDevice(char *refparam, struct dmctx *ctx, voi
 {
 	char buf[4096] = {0};
 
-	bool is1905 = dmuci_string_to_boolean(dmjson_get_value(((struct dm_data *)data)->json_object, 1, "is1905"));
-
-	char *linker = dmjson_get_value(((struct dm_data *)data)->json_object, 1, is1905 ? "link_macaddr" : "macaddr");
+	char *linker = dmjson_get_value(((struct dm_data *)data)->json_object, 1, "macaddr");
 
 	bbfdm_get_references(ctx, MATCH_FIRST, "Device.WiFi.AccessPoint.*.AssociatedDevice.", "MACAddress", linker, buf, sizeof(buf));
+	bbfdm_get_references(ctx, MATCH_FIRST, "Device.WiFi.DataElements.Network.Device.*.APMLD.*.STAMLD.", "MLDMACAddress", linker, buf, sizeof(buf));
 
 	*value = dmstrdup(buf);
 	return 0;