diff --git a/nms-patches/BlockFireAbstract.patch b/nms-patches/BlockFireAbstract.patch
index 1bbccb5b9..a84cd77f9 100644
--- a/nms-patches/BlockFireAbstract.patch
+++ b/nms-patches/BlockFireAbstract.patch
@@ -33,7 +33,20 @@
      }
  
      @Override
-@@ -103,4 +110,12 @@
+@@ -83,6 +90,12 @@
+     }
+ 
+     private static boolean b(World world, BlockPosition blockposition, EnumDirection enumdirection) {
++        // CraftBukkit start - SPIGOT-6311: Do not calculate portals for up/down directions
++        if (enumdirection == EnumDirection.UP || enumdirection == EnumDirection.DOWN) {
++            return false;
++        }
++        // CraftBukkit end
++
+         if (!a(world)) {
+             return false;
+         } else {
+@@ -103,4 +116,12 @@
              return flag && BlockPortalShape.a((GeneratorAccess) world, blockposition, enumdirection.h().n()).isPresent();
          }
      }