diff --git a/src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java
index 1697f1a..d1dfdd2 100644
--- a/src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java
@@ -52,6 +52,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.onosproject.xosclient.api.VtnServiceApi.NetworkType.PRIVATE;
+import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.ACCESS_AGENT;
 import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.MANAGEMENT;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -338,6 +339,12 @@
 
     @Override
     public void instanceDetected(Instance instance) {
+        // TODO remove this when XOS provides access agent information
+        // and handle it the same way wit the other instances
+        if (instance.serviceType() == ACCESS_AGENT) {
+            return;
+        }
+
         VtnService service = getVtnService(instance.serviceId());
         if (service == null) {
             return;
@@ -353,6 +360,12 @@
 
     @Override
     public void instanceRemoved(Instance instance) {
+        // TODO remove this when XOS provides access agent information
+        // and handle it the same way wit the other instances
+        if (instance.serviceType() == ACCESS_AGENT) {
+            return;
+        }
+
         VtnService service = getVtnService(instance.serviceId());
         if (service == null) {
             return;
