diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
index 20c2b3d..03811e2 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
@@ -527,8 +527,12 @@
             selector.extension(ofdpaMatchVlanVid, deviceId);
 
             if (!assignedVlan.equals(vidCriterion.vlanId())) {
-                OfdpaSetVlanVid ofdpaSetVlanVid = new OfdpaSetVlanVid(assignedVlan);
-                treatment.extension(ofdpaSetVlanVid, deviceId);
+                if (useSetVlanExtension) {
+                    OfdpaSetVlanVid ofdpaSetVlanVid = new OfdpaSetVlanVid(assignedVlan);
+                    treatment.extension(ofdpaSetVlanVid, deviceId);
+                } else {
+                    treatment.setVlanId(assignedVlan);
+                }
             }
         }