diff --git a/app/src/main/java/org/opencord/olt/impl/OltFlowService.java b/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
index fd754a0..bf49483 100644
--- a/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
+++ b/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
@@ -610,8 +610,12 @@
         TrafficSelector.Builder selectorBuilder = DefaultTrafficSelector.builder()
                 .matchVlanId(tagInformation.getPonSTag())
                 .matchInPort(uplinkPort)
-                .matchInnerVlanId(tagInformation.getPonCTag())
-                .matchMetadata(tagInformation.getPonCTag().toShort());
+                .matchInnerVlanId(tagInformation.getPonCTag());
+
+
+        if (tagInformation.getPonCTag().toShort() != VlanId.ANY_VALUE) {
+            selectorBuilder.matchMetadata(tagInformation.getPonCTag().toShort());
+        }
 
         if (tagInformation.getDsPonSTagPriority() != NO_PCP) {
             selectorBuilder.matchVlanPcp((byte) tagInformation.getDsPonSTagPriority());
diff --git a/app/src/main/java/org/opencord/olt/impl/OsgiPropertyConstants.java b/app/src/main/java/org/opencord/olt/impl/OsgiPropertyConstants.java
index 3efeee8..37f4b3c 100644
--- a/app/src/main/java/org/opencord/olt/impl/OsgiPropertyConstants.java
+++ b/app/src/main/java/org/opencord/olt/impl/OsgiPropertyConstants.java
@@ -27,9 +27,6 @@
     public static final String DEFAULT_MCAST_SERVICE_NAME = "multicastServiceName";
     public static final String DEFAULT_MCAST_SERVICE_NAME_DEFAULT = "MC";
 
-    public static final String DEFAULT_VLAN = "defaultVlan";
-    public static final short DEFAULT_VLAN_DEFAULT = 0;
-
     public static final String ENABLE_DHCP_ON_PROVISIONING = "enableDhcpOnProvisioning";
     public static final boolean ENABLE_DHCP_ON_PROVISIONING_DEFAULT = false;