diff --git a/mapmaker/routing/__init__.py b/mapmaker/routing/__init__.py
index 303b0c15..54f73fa7 100644
--- a/mapmaker/routing/__init__.py
+++ b/mapmaker/routing/__init__.py
@@ -827,7 +827,12 @@ def bypass_missing_node(ms_node):
 
         # Removing missing nodes (in FC and AC)
         if settings.get('NPO', False):
-            missing_nodes = [c for c in connectivity_graph.nodes if c in self.__missing_identifiers]
+            missing_nodes = [
+                c
+                for c in connectivity_graph
+                    if c in self.__missing_identifiers
+                        or connectivity_graph.nodes[c].get('node') in self.__missing_identifiers
+            ]
             for ms_node in missing_nodes:
                 bypass_missing_node(ms_node)