diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/BeehiveCoordinates.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/BeehiveCoordinates.java
index 66a9feee..23a1e584 100755
--- a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/BeehiveCoordinates.java
+++ b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/BeehiveCoordinates.java
@@ -76,7 +76,7 @@ else if (event.getPacketType() == PacketType.Play.Server.WINDOW_ITEMS) {
 
             for (int i = 0; i < packet.getItems().size(); i++) {
                 ItemStack itemStack = packet.getItems().get(i);
-                if (itemStack == null || itemStack.isEmpty()) return;
+                if (itemStack == null || itemStack.isEmpty()) continue;
 
                 if (useComponentSystem) {
                     PatchableComponentMap componentMap = itemStack.getComponents();
@@ -129,6 +129,7 @@ private boolean filterComponent(PatchableComponentMap componentMap) {
                 if (filterComponent(patchableComponentMap)) {
                     itemStack.setComponents(patchableComponentMap);
                     bundleContents.getItems().set(i, itemStack);
+                    needsReEncode = true;
                 }
             }
             if (needsReEncode)
@@ -143,6 +144,7 @@ private boolean filterComponent(PatchableComponentMap componentMap) {
                 if (filterComponent(patchableComponentMap)) {
                     itemStack.setComponents(patchableComponentMap);
                     containerContents.getItems().set(i, itemStack);
+                    needsReEncode = true;
                 }
             }
             if (needsReEncode)
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/BeehiveCoordinates.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/BeehiveCoordinates.java
index 96f6e1d4..a4c3e7cf 100755
--- a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/BeehiveCoordinates.java
+++ b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/BeehiveCoordinates.java
@@ -76,7 +76,7 @@ else if (event.getPacketType() == PacketType.Play.Server.WINDOW_ITEMS) {
 
             for (int i = 0; i < packet.getItems().size(); i++) {
                 ItemStack itemStack = packet.getItems().get(i);
-                if (itemStack == null || itemStack.isEmpty()) return;
+                if (itemStack == null || itemStack.isEmpty()) continue;
 
                 if (useComponentSystem) {
                     PatchableComponentMap componentMap = itemStack.getComponents();
@@ -129,6 +129,7 @@ private boolean filterComponent(PatchableComponentMap componentMap) {
                 if (filterComponent(patchableComponentMap)) {
                     itemStack.setComponents(patchableComponentMap);
                     bundleContents.getItems().set(i, itemStack);
+                    needsReEncode = true;
                 }
             }
             if (needsReEncode)
@@ -143,6 +144,7 @@ private boolean filterComponent(PatchableComponentMap componentMap) {
                 if (filterComponent(patchableComponentMap)) {
                     itemStack.setComponents(patchableComponentMap);
                     containerContents.getItems().set(i, itemStack);
+                    needsReEncode = true;
                 }
             }
             if (needsReEncode)