diff --git a/Source/Engine/Networking/NetworkReplicator.cpp b/Source/Engine/Networking/NetworkReplicator.cpp
index 74a4f14e5..232980f9f 100644
--- a/Source/Engine/Networking/NetworkReplicator.cpp
+++ b/Source/Engine/Networking/NetworkReplicator.cpp
@@ -1304,7 +1304,11 @@ bool NetworkReplicator::HasObject(const ScriptingObject* obj)
 
 void NetworkReplicator::MapObjectId(Guid& objectId)
 {
-    IdsRemappingTable.TryGet(objectId, objectId);
+    if (!IdsRemappingTable.TryGet(objectId, objectId))
+    {
+        // Try inverse mapping
+        IdsRemappingTable.KeyOf(objectId, &objectId);
+    }
 }
 
 ScriptingObject* NetworkReplicator::ResolveForeignObject(Guid objectId)