diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp
index 0f73d18d..bcc6a5d6 100644
--- a/src/lib/component/controller/GraphController.cpp
+++ b/src/lib/component/controller/GraphController.cpp
@@ -122,10 +122,11 @@ void GraphController::handleMessage(MessageGraphNodeBundleSplit* message)
 		}
 	}
 
-	setActiveAndVisibility(utility::concat(m_activeNodeIds, m_activeEdgeIds));
+	std::vector<Id> tokenIds = utility::concat(m_activeNodeIds, m_activeEdgeIds);
+	setActiveAndVisibility(tokenIds);
 
 	layoutNesting();
-	layoutGraph(true);
+	layoutGraph(tokenIds.size() > 0);
 
 	buildGraph(message);
 }