diff --git a/fabrictestbed_extensions/fablib/network_service.py b/fabrictestbed_extensions/fablib/network_service.py
index 8208cf0d..e5d86f09 100644
--- a/fabrictestbed_extensions/fablib/network_service.py
+++ b/fabrictestbed_extensions/fablib/network_service.py
@@ -151,7 +151,7 @@ def calculate_l2_nstype(interfaces: List[Interface] = None) -> ServiceType:
             # L2PTP limitation for Facility Ports:
             # basically the layer-2 point-to-point server template applied is not popping
             # vlan tags over the MPLS tunnel between two facility ports.
-            if includes_facility_port and facility_port_interfaces < 2:
+            if includes_facility_port and facility_port_interfaces < 2 and not basic_nic_count:
                 # For now WAN FacilityPorts require L2PTP
                 rtn_nstype = NetworkService.network_service_map["L2PTP"]
             elif len(interfaces) >= 2: