diff --git a/src/tests/tools/load_gen/ServiceGenerator.py b/src/tests/tools/load_gen/ServiceGenerator.py
index 6322251718e9e1b55de50a2c5e524a10edf7a6d0..86a70d9c5c7bd84c8ff4b98926f94329798dd6d5 100644
--- a/src/tests/tools/load_gen/ServiceGenerator.py
+++ b/src/tests/tools/load_gen/ServiceGenerator.py
@@ -160,13 +160,14 @@ class ServiceGenerator:
         # identify compatible destination endpoint types
         src_endpoint_type = self._endpoint_ids_to_types.get((src_device_uuid,src_endpoint_uuid))
         dst_endpoint_type = ENDPOINT_COMPATIBILITY.get(src_endpoint_type)
+        dst_endpoint_types = {dst_endpoint_type} if service_type in {SERVICE_TYPE_TAPI} else None
 
         # identify expluded destination devices
         exclude_device_uuids = {} if service_type in {SERVICE_TYPE_TAPI} else {src_device_uuid}
 
         # choose feasible destination endpoint
         dst = self._use_device_endpoint(
-            service_uuid, endpoint_types={dst_endpoint_type}, exclude_device_uuids=exclude_device_uuids)
+            service_uuid, endpoint_types=dst_endpoint_types, exclude_device_uuids=exclude_device_uuids)
         
         # if destination endpoint not found, release source, and terminate current service generation
         if dst is None:
diff --git a/src/tests/tools/load_gen/__main__.py b/src/tests/tools/load_gen/__main__.py
index 28ffb2a9a6c965a308f7ecc9856b901c6bfc652e..c1a995ebbcb9b2e0e46bbbe7842a8ea08a70c4fa 100644
--- a/src/tests/tools/load_gen/__main__.py
+++ b/src/tests/tools/load_gen/__main__.py
@@ -26,9 +26,9 @@ def main():
     parameters = Parameters(
         num_services  = 100,
         service_types = [
-            #SERVICE_TYPE_L2NM,
-            #SERVICE_TYPE_L3NM,
-            SERVICE_TYPE_TAPI,
+            SERVICE_TYPE_L2NM,
+            SERVICE_TYPE_L3NM,
+            #SERVICE_TYPE_TAPI,
         ],
         offered_load  = 50,
         holding_time  = 10,