diff --git a/VpSharp/src/VirtualParadiseClient.NativeEvents.cs b/VpSharp/src/VirtualParadiseClient.NativeEvents.cs
index 81cd457..7c3d96f 100644
--- a/VpSharp/src/VirtualParadiseClient.NativeEvents.cs
+++ b/VpSharp/src/VirtualParadiseClient.NativeEvents.cs
@@ -458,6 +458,13 @@ public sealed partial class VirtualParadiseClient
         var location = new Location(world, position, rotation);
 
         VirtualParadiseAvatar avatar = GetAvatar(session)!;
+        avatar.Location = location;
+
+        if (world != CurrentWorld)
+        {
+            _avatars.TryRemove(session, out _);
+        }
+
         var args = new TeleportedEventArgs(avatar, location);
         _teleported.OnNext(args);
     }