diff --git a/patches/server/0820-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0820-Prevent-ContainerOpenersCounter-openCount-from-going.patch
new file mode 100644
index 000000000..0e41fd274
--- /dev/null
+++ b/patches/server/0820-Prevent-ContainerOpenersCounter-openCount-from-going.patch
@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Tue, 30 Nov 2021 05:30:35 +0000
+Subject: [PATCH] Prevent ContainerOpenersCounter openCount from going negative
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java b/src/main/java/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java
+index 5dceda79d13412a73002af39511c9268c47788ea..55c5dfc51196ff04abeb8b0eb82a399dd8a90e1c 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java
+@@ -50,6 +50,7 @@ public abstract class ContainerOpenersCounter {
+ 
+     public void decrementOpeners(Player player, Level world, BlockPos pos, BlockState state) {
+         int oldPower = Math.max(0, Math.min(15, this.openCount)); // CraftBukkit - Get power before new viewer is added
++        if (this.openCount == 0) return; // Paper
+         int i = this.openCount--;
+ 
+         // CraftBukkit start - Call redstone event