diff --git a/apps/l3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnManager.java b/apps/l3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnManager.java
index 3b45c7d..0cb86ab 100644
--- a/apps/l3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnManager.java
+++ b/apps/l3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnManager.java
@@ -592,7 +592,9 @@
                                                             devMod);
         ResourceData resData = modelConverter.createDataNode(driMod);
         addToStore(resData);
-        checkAndUpdateTunnel(inst, id);
+        // TODO: Enable tunnel creation on-demand. Uncomment below after
+        // complete validation
+        //checkAndUpdateTunnel(inst, id);
         return info;
     }
 
@@ -941,7 +943,9 @@
                         driverService, devMod);
                 ResourceData resData = modelConverter.createDataNode(driMod);
                 deleteFromStore(resData);
-                tnlHandler.deleteTunnel(dev, instance.vpnName());
+                // TODO: Enable tunnel creation on-demand. Uncomment below after
+                // complete validation
+                // tnlHandler.deleteTunnel(dev, instance.vpnName());
             }
             l3VpnStore.removeVpnInstance(instance.vpnName());
         }