diff --git a/Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index 9dadb8d08b..6f4b098ddb 100644
--- a/Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -45,7 +45,7 @@ index edd8e7810f..5349a3a8bc 100644
  
                          chunk.setTileEntity(tileentity1.getPosition(), tileentity1);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 38d673d8fe..bb2059fda7 100644
+index 38d673d8fe..902aa562cc 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World {
@@ -53,7 +53,7 @@ index 38d673d8fe..bb2059fda7 100644
  
          this.entitiesByUUID.remove(entity.getUniqueID());
 -        this.getChunkProvider().removeEntity(entity);
-+        if (entity.getCurrentChunk() != null ) this.getChunkProvider().removeEntity(entity); // Paper
++        this.getChunkProvider().removeEntity(entity); // Paper
          if (entity instanceof EntityPlayer) {
              EntityPlayer entityplayer = (EntityPlayer) entity;