diff --git a/Spigot-Server-Patches/0424-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0424-Set-Zombie-last-tick-at-start-of-drowning-process.patch
new file mode 100644
index 0000000000..064765ef8c
--- /dev/null
+++ b/Spigot-Server-Patches/0424-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -0,0 +1,22 @@
+From 913bbe3923900c1c17b7bf62d8d1b4ba4e317ede Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach@zachbr.io>
+Date: Mon, 4 Mar 2019 02:23:28 -0500
+Subject: [PATCH] Set Zombie last tick at start of drowning process
+
+Fixes GH-1887
+
+diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
+index 24bc3e0f0..bf2bed002 100644
+--- a/src/main/java/net/minecraft/server/EntityZombie.java
++++ b/src/main/java/net/minecraft/server/EntityZombie.java
+@@ -175,6 +175,7 @@ public class EntityZombie extends EntityMonster {
+                     ++this.bI;
+                     if (this.bI >= 600) {
+                         this.startDrownedConversion(300);
++                        this.lastTick = MinecraftServer.currentTick; // Paper - Make sure this is set at start of process - GH-1887
+                     }
+                 } else {
+                     this.bI = -1;
+-- 
+2.21.0
+