diff --git a/src/context/service/database/Device.py b/src/context/service/database/Device.py
index 9897aa0af257fe12fb51514a0418f8a8433629f0..df57791adf7faf04cb24c372d82ce547f35b9c72 100644
--- a/src/context/service/database/Device.py
+++ b/src/context/service/database/Device.py
@@ -185,6 +185,7 @@ def device_set(db_engine : Engine, messagebroker : MessageBroker, request : Devi
             endpoint_updates = session.execute(stmt).fetchall()
             updated_endpoints = any([(updated_at > created_at) for created_at,updated_at in endpoint_updates])
 
+        device_topology_ids = []
         if not updated or len(related_topologies) > 1:
             # Only update topology-device relations when device is created (not updated) or when endpoints are
             # modified (len(related_topologies) > 1).
@@ -204,8 +205,6 @@ def device_set(db_engine : Engine, messagebroker : MessageBroker, request : Devi
                 device_topologies : List[TopologyModel] = query.all()
                 device_topology_ids = [obj.dump_id() for obj in device_topologies]
                 LOGGER.warning('device_topology_ids={:s}'.format(str(device_topology_ids)))
-            else:
-                device_topology_ids = []
 
         changed_config_rules = upsert_config_rules(session, config_rules, device_uuid=device_uuid)