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 00ab474..fd754a0 100644
--- a/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
+++ b/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
@@ -626,10 +626,6 @@
                 .popVlan()
                 .setOutput(subscriberPort);
 
-        //If the subscriber Vlan (cTag) is different than ANY we should set it
-        if (tagInformation.getPonCTag().toShort() != VlanId.ANY_VALUE) {
-            treatmentBuilder.setVlanId(tagInformation.getPonCTag());
-        }
         treatmentBuilder.writeMetadata(createMetadata(tagInformation.getPonCTag(),
                                                       tagInformation.getTechnologyProfileId(),
                                                       subscriberPort), 0);
@@ -639,7 +635,8 @@
             treatmentBuilder.setVlanPcp((byte) tagInformation.getUsPonCTagPriority());
         }
 
-        if (!VlanId.NONE.equals(tagInformation.getUniTagMatch())) {
+        if (!VlanId.NONE.equals(tagInformation.getUniTagMatch()) &&
+                tagInformation.getPonCTag().toShort() != VlanId.ANY_VALUE) {
             treatmentBuilder.setVlanId(tagInformation.getUniTagMatch());
         }