diff --git a/Spigot-Server-Patches/Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/Ensure-safe-gateway-teleport.patch
index 1d08fe4d31..477b3b7fed 100644
--- a/Spigot-Server-Patches/Ensure-safe-gateway-teleport.patch
+++ b/Spigot-Server-Patches/Ensure-safe-gateway-teleport.patch
@@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                this.a((Entity) list.get(this.world.random.nextInt(list.size())));
 +            // Paper start
 +            for (Entity entity : list) {
-+                if (!entity.isPassenger() && !entity.isVehicle() && entity.canPortal()) {
++                if (entity.canPortal()) {
 +                    this.a(entity);
 +                    break;
 +                }