diff --git a/src/main/java/net/knarcraft/stargate/listener/StargateTeleportListener.java b/src/main/java/net/knarcraft/stargate/listener/StargateTeleportListener.java
index 7ea7b71..8a4efa7 100644
--- a/src/main/java/net/knarcraft/stargate/listener/StargateTeleportListener.java
+++ b/src/main/java/net/knarcraft/stargate/listener/StargateTeleportListener.java
@@ -79,6 +79,7 @@ public class StargateTeleportListener implements Listener {
         // Cancel end gateway teleportation to the same destination
         if (event.getTo() != null && cause == PlayerTeleportEvent.TeleportCause.END_GATEWAY &&
                 PortalHandler.getByAdjacentEntrance(event.getFrom()) != null &&
+                event.getFrom().getWorld() != null && event.getFrom().getWorld().equals(event.getTo().getWorld()) &&
                 event.getFrom().distance(event.getTo()) <= 1) {
             event.setCancelled(true);
         }