diff --git a/patches/server/Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/Make-hoppers-respect-inventory-max-stack-size.patch
index aee7f0d87..5692b4464 100644
--- a/patches/server/Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/Make-hoppers-respect-inventory-max-stack-size.patch
@@ -9,7 +9,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -0,0 +0,0 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-                 stack = ItemStack.EMPTY;
+ 
+             if (itemstack1.isEmpty()) {
+                 // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
++                ItemStack leftover = ItemStack.EMPTY; // Paper
+                 if (!stack.isEmpty() && stack.getCount() > to.getMaxStackSize()) {
++                    leftover = stack; // Paper
+                     stack = stack.split(to.getMaxStackSize());
+                 }
+                 // Spigot end
+                 IGNORE_TILE_UPDATES = true; // Paper
+                 to.setItem(slot, stack);
+                 IGNORE_TILE_UPDATES = false; // Paper
+-                stack = ItemStack.EMPTY;
++                stack = leftover; // Paper
                  flag = true;
              } else if (HopperBlockEntity.canMergeItems(itemstack1, stack)) {
 -                int j = stack.getMaxStackSize() - itemstack1.getCount();