diff --git a/VpSharp/src/Entities/VirtualParadiseAvatar.cs b/VpSharp/src/Entities/VirtualParadiseAvatar.cs
index 5ca6f24..5100001 100644
--- a/VpSharp/src/Entities/VirtualParadiseAvatar.cs
+++ b/VpSharp/src/Entities/VirtualParadiseAvatar.cs
@@ -443,7 +443,9 @@ public sealed class VirtualParadiseAvatar : IEquatable<VirtualParadiseAvatar>
             }
         }
 
-        Location = new Location(new VirtualParadiseWorld(_client, world), position, rotation);
+        VirtualParadiseWorld? updatedWorld = isNewWorld ? await _client.GetWorldAsync(world) : Location.World;
+        updatedWorld ??= new VirtualParadiseWorld(_client, world);
+        Location = new Location(updatedWorld, position, rotation);
         // ReSharper restore InconsistentlySynchronizedField
     }