diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java
index cc6e100..a9c15d8 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java
@@ -251,12 +251,10 @@
                     ethCriterion = (EthCriterion) criterion;
                     break;
                 case VLAN_VID:
-                    if (innervidCriterion == null) {
-                        innervidCriterion = (VlanIdCriterion) criterion;
-                    } else {
-                        outerVidCriterion = innervidCriterion;
-                        innervidCriterion = (VlanIdCriterion) criterion;
-                    }
+                    outerVidCriterion = (VlanIdCriterion) criterion;
+                    break;
+                case INNER_VLAN_VID:
+                    innervidCriterion = (VlanIdCriterion) criterion;
                     break;
                 default:
                     log.warn("Unsupported filter {}", criterion);