diff --git a/VpSharp/src/VirtualParadiseClient.cs b/VpSharp/src/VirtualParadiseClient.cs
index 31a2f92..a88ce5e 100644
--- a/VpSharp/src/VirtualParadiseClient.cs
+++ b/VpSharp/src/VirtualParadiseClient.cs
@@ -390,11 +390,6 @@ public sealed partial class VirtualParadiseClient : IDisposable
             CurrentAvatar.Location = new Location(world);
         }
 
-        lock (Lock)
-        {
-            _ = vp_state_change(NativeInstanceHandle);
-        }
-
         world.Size = new Size(size, size);
 
         CurrentAvatar = new VirtualParadiseAvatar(this, -1)
@@ -411,6 +406,11 @@ public sealed partial class VirtualParadiseClient : IDisposable
             _worldSettings.Clear();
         }
 
+        lock (Lock)
+        {
+            _ = vp_state_change(NativeInstanceHandle);
+        }
+
         if (_configuration.AutoQuery)
         {
             _ = Task.Run(async () =>