diff --git a/client/app/scripts/stores/app-store.js b/client/app/scripts/stores/app-store.js
index f3d44047c..a55234b1f 100644
--- a/client/app/scripts/stores/app-store.js
+++ b/client/app/scripts/stores/app-store.js
@@ -222,7 +222,10 @@ AppStore.registeredCallback = function(payload) {
       break;
 
     case ActionTypes.ROUTE_TOPOLOGY:
-      nodes = {};
+      if (currentTopologyId !== payload.state.topologyId
+        || currentGrouping !== payload.state.grouping) {
+        nodes = {};
+      }
       currentTopologyId = payload.state.topologyId;
       currentGrouping = payload.state.grouping;
       selectedNodeId = payload.state.selectedNodeId;