diff --git a/Spigot-Server-Patches/0416-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0416-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
new file mode 100644
index 0000000000..1d89db1079
--- /dev/null
+++ b/Spigot-Server-Patches/0416-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -0,0 +1,27 @@
+From 4e5047aa15ef2bd2dcd40434ef0b97a2bdc8d7d4 Mon Sep 17 00:00:00 2001
+From: connorhartley <vectrixu+gh@gmail.com>
+Date: Mon, 7 Jan 2019 14:43:48 -0600
+Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+index 32557caf2..596478120 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -1106,6 +1106,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+     public void n() {
+         this.cB = true;
+         this.ejectPassengers();
++
++        // Paper start - Workaround an issue where the vehicle doesn't track the passenger disconnection dismount.
++        if (this.isPassenger() && this.getVehicle() instanceof EntityLiving) {
++            this.stopRiding();
++        }
++        // Paper end
++
+         if (this.sleeping) {
+             this.a(true, false, false);
+         }
+-- 
+2.20.1
+