diff --git a/src/sdx_pce/topology/manager.py b/src/sdx_pce/topology/manager.py
index 61a69621..c0162ea3 100644
--- a/src/sdx_pce/topology/manager.py
+++ b/src/sdx_pce/topology/manager.py
@@ -253,6 +253,11 @@ def update_topology(self, data):
         # inter-domain links
         self.add_inter_domain_links(topology, interdomain_ports)
 
+        # Update the port node map
+        for node in topology.nodes:
+            for port in node.ports:
+                self._port_node_map[port.id] = node
+
         self.update_version(True)
         self.update_timestamp()