diff --git a/src/device/service/Tools.py b/src/device/service/Tools.py
index 086e5a0711e01593c41e061bfdeac965b51850e5..0698be883c83c6b9863ed8410a0fe266ecc5419d 100644
--- a/src/device/service/Tools.py
+++ b/src/device/service/Tools.py
@@ -102,8 +102,8 @@ def populate_endpoints(device : Device, driver : _Driver, monitoring_loops : Mon
         endpoint_uuid = resource_value.get('uuid')
 
         device_endpoint = device.device_endpoints.add()
-        device_endpoint.topology_id.context_id.context_uuid.uuid = DEFAULT_CONTEXT_NAME
-        device_endpoint.topology_id.topology_uuid.uuid = DEFAULT_TOPOLOGY_NAME
+        device_endpoint.endpoint_id.topology_id.context_id.context_uuid.uuid = DEFAULT_CONTEXT_NAME
+        device_endpoint.endpoint_id.topology_id.topology_uuid.uuid = DEFAULT_TOPOLOGY_NAME
         device_endpoint.endpoint_id.device_id.device_uuid.uuid = device_uuid
         device_endpoint.endpoint_id.endpoint_uuid.uuid = endpoint_uuid
         device_endpoint.endpoint_type = resource_value.get('type')