diff --git a/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
index bdf5135a3..972daeb48 100644
--- a/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
+++ b/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
@@ -1,4 +1,4 @@
-From 339e436f6fbc5278904715ac9cc65b0273e6d417 Mon Sep 17 00:00:00 2001
+From 5d197934f78cbc807e7c6e7f5f04b613a8454c75 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:56:02 +1000
 Subject: [PATCH] Better Chunk Tick Selection
@@ -116,7 +116,7 @@ index cd529ec..53ab411 100644
  
          this.methodProfiler.b();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b9b967f..812e887 100644
+index b9b967f..40bb548 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -306,10 +306,20 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -151,6 +151,14 @@ index b9b967f..812e887 100644
                              block.a(this, k2 + k, i3 + chunksection.getYPosition(), l2 + l, this.random);
                          }
                      }
+@@ -408,6 +419,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
+ 
+             this.methodProfiler.b();
+         }
++        this.chunkTickList.clear(); // Spigot
+     }
+ 
+     public boolean a(int i, int j, int k, Block block) {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 index 961ddb4..478d9e6 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java