diff --git a/include/Nazara/Core/Systems/SystemGraph.inl b/include/Nazara/Core/Systems/SystemGraph.inl
index 6db8d5409..3027c03fb 100644
--- a/include/Nazara/Core/Systems/SystemGraph.inl
+++ b/include/Nazara/Core/Systems/SystemGraph.inl
@@ -53,7 +53,10 @@ namespace Nz
 
 		T& system = nodePtr->system;
 
+		std::size_t nodeIndex = m_nodes.size();
+
 		m_nodes.emplace_back(std::move(nodePtr));
+		m_systemToNodes.emplace(entt::type_hash<T>(), nodeIndex);
 		m_systemOrderUpdated = false;
 
 		return system;