diff --git a/velocity/src/main/java/net/draycia/carbon/velocity/users/CarbonPlayerVelocity.java b/velocity/src/main/java/net/draycia/carbon/velocity/users/CarbonPlayerVelocity.java
index e282c03b3..3b5603b6f 100644
--- a/velocity/src/main/java/net/draycia/carbon/velocity/users/CarbonPlayerVelocity.java
+++ b/velocity/src/main/java/net/draycia/carbon/velocity/users/CarbonPlayerVelocity.java
@@ -80,8 +80,10 @@ public boolean sameWorldAs(final CarbonPlayer other) {
             return false;
         }
 
-        final var playerServer = player.get().getCurrentServer();
-        return playerServer.isPresent() && playerServer.equals(otherPlayer.get().getCurrentServer());
+        final var playerServer = player.get().getCurrentServer().get();
+        final var otherServer = otherPlayer.get().getCurrentServer().get();
+
+        return playerServer.getServer().equals(otherServer.getServer());
     }
 
     @Override