diff --git a/patches/server/Optimize-Hoppers.patch b/patches/server/Optimize-Hoppers.patch
index 9a91c7ed7..961c9c8ae 100644
--- a/patches/server/Optimize-Hoppers.patch
+++ b/patches/server/Optimize-Hoppers.patch
@@ -79,7 +79,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            // Paper end - Perf: Optimize Hoppers
              return ItemStack.EMPTY;
          } else {
-             ItemStack itemstack = new ItemStack(this.getItem(), this.count, this.components.copy());
+-            ItemStack itemstack = new ItemStack(this.getItem(), this.count, this.components.copy());
++            ItemStack itemstack = new ItemStack(originalItem ? this.item : this.getItem(), this.count, this.components.copy()); // Paper - Perf: Optimize Hoppers
+ 
+             itemstack.setPopTime(this.getPopTime());
+             return itemstack;
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java