diff --git a/nms-patches/EntityDolphin.patch b/nms-patches/EntityDolphin.patch
index ebf3f33b9b..da1c477545 100644
--- a/nms-patches/EntityDolphin.patch
+++ b/nms-patches/EntityDolphin.patch
@@ -21,6 +21,15 @@
                  this.setSlot(EnumItemSlot.MAINHAND, itemstack);
                  this.dropChanceHand[EnumItemSlot.MAINHAND.b()] = 2.0F;
                  this.receive(entityitem, itemstack.getCount());
+@@ -317,7 +322,7 @@
+ 
+         @Override
+         public boolean a() {
+-            return this.a.eq() && this.a.getAirTicks() >= 100;
++            return this.a.eq() && this.a.getAirTicks() >= 100 && this.a.world.getWorld().canGenerateStructures(); // MC-151364, SPIGOT-5494: hangs if generate-structures=false
+         }
+ 
+         @Override
 @@ -425,7 +430,7 @@
  
          @Override