diff --git a/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index 64fe2fc..90da4b4 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -998,7 +998,23 @@
 
     private boolean processSinglePortFiltersInternal(DeviceId deviceId, PortNumber portnum,
                                                       boolean pushVlan, VlanId vlanId, boolean install) {
-        FilteringObjective.Builder fob = buildFilteringObjective(deviceId, portnum, pushVlan, vlanId);
+        boolean doTMAC = true;
+
+        if (!pushVlan) {
+            // Skip the tagged vlans belonging to an interface without an IP address
+            Set<Interface> ifaces = srManager.interfaceService
+                    .getInterfacesByPort(new ConnectPoint(deviceId, portnum))
+                    .stream()
+                    .filter(intf -> intf.vlanTagged().contains(vlanId) && intf.ipAddressesList().isEmpty())
+                    .collect(Collectors.toSet());
+            if (!ifaces.isEmpty()) {
+                log.debug("processSinglePortFiltersInternal: skipping TMAC for vlan {} at {}/{} - no IP",
+                          vlanId, deviceId, portnum);
+                doTMAC = false;
+            }
+        }
+
+        FilteringObjective.Builder fob = buildFilteringObjective(deviceId, portnum, pushVlan, vlanId, doTMAC);
         if (fob == null) {
             // error encountered during build
             return false;
@@ -1019,7 +1035,7 @@
     }
 
     private FilteringObjective.Builder buildFilteringObjective(DeviceId deviceId, PortNumber portnum,
-                                                               boolean pushVlan, VlanId vlanId) {
+                                                               boolean pushVlan, VlanId vlanId, boolean doTMAC) {
         MacAddress deviceMac;
         try {
             deviceMac = config.getDeviceMac(deviceId);
@@ -1028,9 +1044,15 @@
             return null;
         }
         FilteringObjective.Builder fob = DefaultFilteringObjective.builder();
-        fob.withKey(Criteria.matchInPort(portnum))
-            .addCondition(Criteria.matchEthDst(deviceMac))
-            .withPriority(SegmentRoutingService.DEFAULT_PRIORITY);
+
+        if (doTMAC) {
+            fob.withKey(Criteria.matchInPort(portnum))
+                    .addCondition(Criteria.matchEthDst(deviceMac))
+                    .withPriority(SegmentRoutingService.DEFAULT_PRIORITY);
+        } else {
+            fob.withKey(Criteria.matchInPort(portnum))
+                    .withPriority(SegmentRoutingService.DEFAULT_PRIORITY);
+        }
 
         TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder();