diff --git a/Spigot-Server-Patches/Use-saner-Entity-bounding-box-limits.patch b/Spigot-Server-Patches/Use-saner-Entity-bounding-box-limits.patch
index f239f60471..8bf96427f5 100644
--- a/Spigot-Server-Patches/Use-saner-Entity-bounding-box-limits.patch
+++ b/Spigot-Server-Patches/Use-saner-Entity-bounding-box-limits.patch
@@ -19,8 +19,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  maxZ = axisalignedbb.maxZ;
 +        // Paper start - use saner max's for bounding box
 +        boolean illegal = false;
-+        double maxW = this.getWidth() * 2;
-+        double maxH = this.getHeight();
++        double maxW = Math.max(1, this.getWidth() * 2);
++        double maxH = Math.max(1, this.getHeight());
          double len = axisalignedbb.maxX - axisalignedbb.minX;
 -        if (len < 0) maxX = minX;
 -        if (len > 64) maxX = minX + 64.0;