diff --git a/Game/Scripts/Networking/SteamCharacterNetworkBridge.cs b/Game/Scripts/Networking/SteamCharacterNetworkBridge.cs
index 9f49570..68a1072 100644
--- a/Game/Scripts/Networking/SteamCharacterNetworkBridge.cs
+++ b/Game/Scripts/Networking/SteamCharacterNetworkBridge.cs
@@ -240,9 +240,14 @@ namespace MegaKoop.Game.Networking
             }
 
             CharacterTransformMessage transformMessage = CharacterTransformMessage.Deserialize(message.Payload);
-            if (transformMessage.NetworkId != identity.NetworkId)
+            if (identity != null && transformMessage.NetworkId != identity.NetworkId)
             {
-                return;
+                if (ownerSteamId == 0 || message.Sender != ownerSteamId)
+                {
+                    return;
+                }
+
+                identity.SetNetworkId(transformMessage.NetworkId);
             }
 
             remoteTargetPosition = transformMessage.Position;