diff --git a/sponge/src/main/java/com/griefdefender/claim/GDClaim.java b/sponge/src/main/java/com/griefdefender/claim/GDClaim.java
index 9ad6097..fadbf3e 100644
--- a/sponge/src/main/java/com/griefdefender/claim/GDClaim.java
+++ b/sponge/src/main/java/com/griefdefender/claim/GDClaim.java
@@ -1526,6 +1526,7 @@ private ClaimResult checkSizeLimits(Player player, GDPlayerData playerData, Vect
                 final Component message = MessageCache.getInstance().CREATE_SUBDIVISION_ONLY;
                 GriefDefenderPlugin.sendMessage(player, message);
                 playerData.lastShovelLocation = null;
+                playerData.claimResizing = null;
                 // TODO: Add new result type for this
                 return new GDClaimResult(ClaimResultType.BELOW_MIN_SIZE_X, message);
             }
diff --git a/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java b/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
index 3cf6a9f..56d4a06 100644
--- a/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
+++ b/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
@@ -1262,7 +1262,7 @@ private void onPlayerHandleClaimCreateAction(InteractEvent event, BlockSnapshot
             return;
         }
 
-        if (playerData.claimResizing != null) {
+        if (playerData.claimResizing != null && playerData.lastShovelLocation != null) {
             handleResizeFinish(event, player, location, playerData);
             GDTimings.PLAYER_HANDLE_SHOVEL_ACTION.stopTiming();
             return;