diff --git a/Source/Engine/Networking/NetworkReplicationHierarchy.cpp b/Source/Engine/Networking/NetworkReplicationHierarchy.cpp
index e95a06423..5097b6a26 100644
--- a/Source/Engine/Networking/NetworkReplicationHierarchy.cpp
+++ b/Source/Engine/Networking/NetworkReplicationHierarchy.cpp
@@ -167,6 +167,7 @@ void NetworkReplicationGridNode::AddObject(NetworkReplicationHierarchyObject obj
         cell->MinCullDistance = obj.CullDistance;
     }
     cell->Node->AddObject(obj);
+    _objectToCell[obj.Object] = coord;
 
     // Cache minimum culling distance for a whole cell to skip it at once
     cell->MinCullDistance = Math::Min(cell->MinCullDistance, obj.CullDistance);
@@ -174,26 +175,35 @@ void NetworkReplicationGridNode::AddObject(NetworkReplicationHierarchyObject obj
 
 bool NetworkReplicationGridNode::RemoveObject(ScriptingObject* obj)
 {
-    for (const auto& e : _children)
+    Int3 coord;
+
+    if (!_objectToCell.TryGet(obj, coord))
     {
-        if (e.Value.Node->RemoveObject(obj))
-        {
-            // TODO: remove empty cells?
-            // TODO: update MinCullDistance for cell?
-            return true;
-        }
+        return false;
+    }
+
+    if (_children[coord].Node->RemoveObject(obj))
+    {
+        _objectToCell.Remove(obj);
+        // TODO: remove empty cells?
+        // TODO: update MinCullDistance for cell?
+        return true;
     }
     return false;
 }
 
 bool NetworkReplicationGridNode::GetObject(ScriptingObject* obj, NetworkReplicationHierarchyObject& result)
 {
-    for (const auto& e : _children)
+    Int3 coord;
+
+    if (!_objectToCell.TryGet(obj, coord))
     {
-        if (e.Value.Node->GetObject(obj, result))
-        {
-            return true;
-        }
+        return false;
+    }
+
+    if (_children[coord].Node->GetObject(obj, result))
+    {
+        return true;
     }
     return false;
 }
diff --git a/Source/Engine/Networking/NetworkReplicationHierarchy.h b/Source/Engine/Networking/NetworkReplicationHierarchy.h
index ae482dfa6..b054de453 100644
--- a/Source/Engine/Networking/NetworkReplicationHierarchy.h
+++ b/Source/Engine/Networking/NetworkReplicationHierarchy.h
@@ -246,6 +246,7 @@ private:
     };
 
     Dictionary<Int3, Cell> _children;
+    Dictionary<ScriptingObject*, Int3> _objectToCell;
 
 public:
     /// <summary>