diff --git a/nms-patches/EntityEnderPearl.patch b/nms-patches/EntityEnderPearl.patch
index fff8bbe05c..69309292d6 100644
--- a/nms-patches/EntityEnderPearl.patch
+++ b/nms-patches/EntityEnderPearl.patch
@@ -60,3 +60,12 @@
                  }
              } else if (entity != null) {
                  entity.enderTeleportTo(this.locX(), this.locY(), this.locZ());
+@@ -80,7 +100,7 @@
+     public Entity b(WorldServer worldserver) {
+         Entity entity = this.getShooter();
+ 
+-        if (entity != null && entity.world.getDimensionKey() != worldserver.getDimensionKey()) {
++        if (entity != null && worldserver != null && entity.world.getDimensionKey() != worldserver.getDimensionKey()) { // CraftBukkit - SPIGOT-6113
+             this.setShooter((Entity) null);
+         }
+