diff --git a/src/route.c b/src/route.c
index 5c69671a..16423892 100644
--- a/src/route.c
+++ b/src/route.c
@@ -104,7 +104,7 @@ static void learn_mac(mac_t *address) {
 	avl_node_t *node;
 	connection_t *c;
 
-	subnet = lookup_subnet_mac(address);
+	subnet = lookup_subnet_mac(myself, address);
 
 	/* If we don't know this MAC address yet, store it */
 
@@ -705,7 +705,7 @@ static void route_mac(node_t *source, vpn_packet_t *packet) {
 	/* Lookup destination address */
 
 	memcpy(&dest, &packet->data[0], sizeof dest);
-	subnet = lookup_subnet_mac(&dest);
+	subnet = lookup_subnet_mac(NULL, &dest);
 
 	if(!subnet) {
 		broadcast_packet(source, packet);
diff --git a/src/subnet.c b/src/subnet.c
index 3d1168de..4d646a5d 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -329,7 +329,7 @@ subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
 	return avl_search(owner->subnet_tree, subnet);
 }
 
-subnet_t *lookup_subnet_mac(const mac_t *address) {
+subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
 	subnet_t *p, *r = NULL, subnet = {0};
 	avl_node_t *n;
 	int i;
@@ -339,6 +339,8 @@ subnet_t *lookup_subnet_mac(const mac_t *address) {
 	for(i = 0; i < 2; i++) {
 		if(!cache_mac_valid[i])
 			continue;
+		if(owner && cache_mac_subnet[i] && cache_mac_subnet[i]->owner != owner)
+			continue;
 		if(!memcmp(address, &cache_mac_address[i], sizeof *address))
 			return cache_mac_subnet[i];
 	}
@@ -349,10 +351,10 @@ subnet_t *lookup_subnet_mac(const mac_t *address) {
 	subnet.net.mac.address = *address;
 	subnet.owner = NULL;
 
-	for(n = subnet_tree->head; n; n = n->next) {
+	for(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) {
 		p = n->data;
 		
-		if(!p || p->type != subnet.type)
+		if(!p || p->type != SUBNET_MAC)
 			continue;
 
 		if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
diff --git a/src/subnet.h b/src/subnet.h
index c9bb10e8..b2124a0e 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -77,7 +77,7 @@ extern void subnet_update(struct node_t *, subnet_t *, bool);
 extern bool net2str(char *, int, const subnet_t *);
 extern bool str2net(subnet_t *, const char *);
 extern subnet_t *lookup_subnet(const struct node_t *, const subnet_t *);
-extern subnet_t *lookup_subnet_mac(const mac_t *);
+extern subnet_t *lookup_subnet_mac(const struct node_t *, const mac_t *);
 extern subnet_t *lookup_subnet_ipv4(const ipv4_t *);
 extern subnet_t *lookup_subnet_ipv6(const ipv6_t *);
 extern void dump_subnets(void);