diff --git a/src/main/java/com/songoda/ultimatestacker/database/DataManager.java b/src/main/java/com/songoda/ultimatestacker/database/DataManager.java
index 9ad0357..10f2a7f 100644
--- a/src/main/java/com/songoda/ultimatestacker/database/DataManager.java
+++ b/src/main/java/com/songoda/ultimatestacker/database/DataManager.java
@@ -86,6 +86,7 @@ public class DataManager extends DataManagerAbstract {
     }
 
     public void updateBlock(BlockStack blockStack) {
+        if (blockStack.getAmount() == 0) return;
        this.runAsync(() -> {
             try (Connection connection = this.databaseConnector.getConnection()) {
                 String updateBlock = "UPDATE " + this.getTablePrefix() + "blocks SET amount = ? WHERE id = ?";
diff --git a/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java b/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
index f5d83da..b23a18b 100644
--- a/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
+++ b/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
@@ -74,7 +74,7 @@ public class BlockListeners implements Listener {
                 if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
                     if (!isStacked) plugin.getDataManager().createBlock(stack);
                     if (stack.getMaterial() == CompatibleMaterial.getMaterial(inHand)) {
-                        int amountToAdd = player.isSneaking() || Settings.ALWAYS_ADD_ALL.getBoolean() ? inHand.getAmount() : 1;
+                        int amountToAdd = player.isSneaking() || Settings.ALWAYS_ADD_ALL.getBoolean() ? inHand.getAmount()-1 : 1;
                         if (!isStacked) amountToAdd++;
                         stack.add(amountToAdd);
                         event.setCancelled(true);