diff --git a/apps/routing/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java b/apps/routing/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java
index aeaf13d..c303bdf 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java
@@ -142,12 +142,12 @@
             case REQUEST:
                 // Reply to requests that target our configured interface IP
                 // address on this port. Drop all other requests.
-
                 interfaceService.getInterfacesByPort(context.inPort())
                         .stream()
                         .filter(intf -> intf.ipAddresses()
                                 .stream()
-                                .anyMatch(ia -> ia.ipAddress().equals(context.target())))
+                                .anyMatch(ia -> ia.ipAddress().equals(context.target()) &&
+                                        ia.subnetAddress().contains(context.sender())))
                         .forEach(intf -> context.reply(intf.mac()));
 
                 break;