diff --git a/VpSharp/src/VirtualParadiseClient.cs b/VpSharp/src/VirtualParadiseClient.cs
index 620f35e..31a2f92 100644
--- a/VpSharp/src/VirtualParadiseClient.cs
+++ b/VpSharp/src/VirtualParadiseClient.cs
@@ -397,12 +397,6 @@ public sealed partial class VirtualParadiseClient : IDisposable
 
         world.Size = new Size(size, size);
 
-        if (CurrentWorld is not null)
-        {
-            CurrentWorld.Settings = WorldSettingsConverter.FromDictionary(_worldSettings);
-            _worldSettings.Clear();
-        }
-
         CurrentAvatar = new VirtualParadiseAvatar(this, -1)
         {
             Application = _configuration.Application!,
@@ -411,6 +405,12 @@ public sealed partial class VirtualParadiseClient : IDisposable
             User = CurrentUser!
         };
 
+        if (CurrentWorld is not null)
+        {
+            CurrentWorld.Settings = WorldSettingsConverter.FromDictionary(_worldSettings);
+            _worldSettings.Clear();
+        }
+
         if (_configuration.AutoQuery)
         {
             _ = Task.Run(async () =>