diff --git a/Core/src/main/java/com/plotsquared/core/command/Auto.java b/Core/src/main/java/com/plotsquared/core/command/Auto.java
index c6a17007d..ccba82249 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Auto.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Auto.java
@@ -142,7 +142,8 @@ public class Auto extends SubCommand {
                 } else {
                     player.sendMessage(
                             TranslatableCaption.of("permission.cant_claim_more_plots"),
-                            Template.of("amount", "0")
+                            Template.of("amount", String.valueOf(player.getAllowedPlots())
+                            )
                     );
                     return false;
                 }
diff --git a/Core/src/main/java/com/plotsquared/core/command/Claim.java b/Core/src/main/java/com/plotsquared/core/command/Claim.java
index b294de280..6bfc6d325 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Claim.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Claim.java
@@ -107,17 +107,18 @@ public class Claim extends SubCommand {
                 if (metaDataAccess.isPresent()) {
                     grants = metaDataAccess.get().orElse(0);
                     if (grants <= 0) {
-                        metaDataAccess.remove();
                         player.sendMessage(
                                 TranslatableCaption.of("permission.cant_claim_more_plots"),
                                 Template.of("amount", String.valueOf(grants))
                         );
+                        metaDataAccess.remove();
                     }
                 } else {
                     player.sendMessage(
                             TranslatableCaption.of("permission.cant_claim_more_plots"),
-                            Template.of("amount", String.valueOf(grants))
+                            Template.of("amount", String.valueOf(player.getAllowedPlots()))
                     );
+                    return false;
                 }
             }