diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
index e552385..5479a00 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
@@ -2501,13 +2501,13 @@ public class GriefPrevention extends JavaPlugin
                 return true;
             }
             zone.testForSafeSpot();
-            Location safe = zone.getSafeArea();
+            Location safe = Bukkit.getWorlds().get(0).getSpawnLocation();
             if (safe == null) {
                 player.sendMiniMessage(Config.NoSafeLocation, null); // todo placeholders.
             } else {
                 if (target.isInsideVehicle()) target.leaveVehicle();
-                target.teleport(safe);
-                Bukkit.getPluginManager().callEvent(new PlayerTeleportEvent(target, safe, safe));
+                target.teleport(player);
+                Bukkit.getPluginManager().callEvent(new PlayerTeleportEvent(target, safe, zone.getSafeArea()));
                 player.sendMiniMessage(Config.KickSuccess, placeholders); // todo placeholders.
                 target.sendMiniMessage(Config.KickedFromClaim, placeholders); // todo placeholders.
             }