diff --git a/patches/server/Optimize-Hoppers.patch b/patches/server/Optimize-Hoppers.patch
index 2cf8dde47..f6c586156 100644
--- a/patches/server/Optimize-Hoppers.patch
+++ b/patches/server/Optimize-Hoppers.patch
@@ -422,7 +422,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    private static Container getContainerAt(Level world, double x, double y, double z, boolean optimizeEntities) {
          Object object = null;
          BlockPos blockposition = new BlockPos(x, y, z);
-         if ( !world.hasChunkAt( blockposition ) ) return null; // Spigot
+         if ( !world.spigotConfig.hopperCanLoadChunks && !world.hasChunkAt( blockposition ) ) return null; // Spigot
 @@ -0,0 +0,0 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
              }
          }
diff --git a/work/Bukkit b/work/Bukkit
index c1d911a2b..4d37bf305 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c1d911a2b4f2aaf85aa6cf9030230fe5940d49da
+Subproject commit 4d37bf305844ec2185646ff265affc5b4a9b2b73
diff --git a/work/CraftBukkit b/work/CraftBukkit
index effea36a2..3571ca8d1 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit effea36a28a3a0796a6ac0cc35609573c404e73c
+Subproject commit 3571ca8d133711c77d9507b771c154d649a37e54
diff --git a/work/Spigot b/work/Spigot
index 1dffefb44..56be6a849 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 1dffefb44e3f2feaffe93434bb2e888817798d42
+Subproject commit 56be6a849145345c489133a676c40ae15b27b8c6