diff --git a/server/src/main/java/dev/plex/command/impl/WorldCMD.java b/server/src/main/java/dev/plex/command/impl/WorldCMD.java
index 56cb6f6..d2db03e 100644
--- a/server/src/main/java/dev/plex/command/impl/WorldCMD.java
+++ b/server/src/main/java/dev/plex/command/impl/WorldCMD.java
@@ -31,7 +31,7 @@ public class WorldCMD extends PlexCommand
             return usage();
         }
         World world = getNonNullWorld(args[0]);
-        playerSender.teleportAsync(new Location(world, 0, world.getHighestBlockYAt(0, 0) + 1, 0, 0, 0));
+        playerSender.teleportAsync(world.getSpawnLocation());
         return messageComponent("playerWorldTeleport", world.getName());
     }