diff --git a/Source/Engine/Networking/NetworkReplicator.cpp b/Source/Engine/Networking/NetworkReplicator.cpp
index c584d3526..bf874b3c4 100644
--- a/Source/Engine/Networking/NetworkReplicator.cpp
+++ b/Source/Engine/Networking/NetworkReplicator.cpp
@@ -152,12 +152,12 @@ struct NetworkReplicatedObject
 
     bool operator==(const NetworkReplicatedObject& other) const
     {
-        return Object == other.Object;
+        return ObjectId == other.ObjectId;
     }
 
     bool operator==(const ScriptingObject* other) const
     {
-        return Object == other;
+        return other && ObjectId == other->GetID();
     }
 
     bool operator==(const Guid& other) const
@@ -176,6 +176,11 @@ inline uint32 GetHash(const NetworkReplicatedObject& key)
     return GetHash(key.ObjectId);
 }
 
+inline uint32 GetHash(const ScriptingObject* key)
+{
+    return key ? GetHash(key->GetID()) : 0;
+}
+
 struct Serializer
 {
     NetworkReplicator::SerializeFunc Methods[2];