diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/listeners/AltitudeListener.java b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/listeners/AltitudeListener.java
index 0579b9a..0f1d08b 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/listeners/AltitudeListener.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/listeners/AltitudeListener.java
@@ -7,6 +7,7 @@ import me.ryanhamshire.GriefPrevention.CreateClaimResult;
 import me.ryanhamshire.GriefPrevention.DataStore;
 import me.ryanhamshire.GriefPrevention.GriefPrevention;
 import me.ryanhamshire.GriefPrevention.Messages;
+import me.ryanhamshire.GriefPrevention.PlayerData;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -27,6 +28,7 @@ public class AltitudeListener implements Listener {
     public AltitudeListener(DataStore dataStore, GriefPrevention plugin) {
         this.plugin = plugin;
         this.worldInit();
+        Bukkit.getPluginManager().registerEvents(this, plugin);
     }
 
     private void info(String s) {
@@ -100,7 +102,8 @@ public class AltitudeListener implements Listener {
     {
         if (event.getEntered() instanceof Player player)
         {
-            Claim claim = GriefPrevention.instance.dataStore.getClaimAt(player.getLocation(), true, null);
+            PlayerData playerData = GriefPrevention.instance.dataStore.getPlayerData(player.getUniqueId());
+            Claim claim = GriefPrevention.instance.dataStore.getClaimAt(player.getLocation(), true, playerData.lastClaim);
             if (claim != null)
             {
                 if (claim.allowAccess(player) != null)