diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 049f1752..21885897 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -354,14 +354,15 @@ public class AuthMePlayerListener implements Listener {
         int radius = Settings.getMovementRadius;
         Location spawn = plugin.getSpawnLocation(player);
 
-        if (spawn != null && spawn.getWorld() != null)
+        if (spawn != null && spawn.getWorld() != null) {
             if (!event.getPlayer().getWorld().equals(spawn.getWorld())) {
                 event.getPlayer().teleport(spawn);
                 return;
             }
-        if ((spawn.distance(player.getLocation()) > radius) && spawn.getWorld() != null) {
-            event.getPlayer().teleport(spawn);
-            return;
+            if ((spawn.distance(player.getLocation()) > radius)) {
+                event.getPlayer().teleport(spawn);
+                return;
+            }
         }
     }