diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 43fcba0d7f..8545b50846 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -347,6 +347,12 @@ public class EntityTrackerEntry {
                         entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(0, this.tracker, this.tracker.vehicle));
                     }
 
+                    // CraftBukkit start
+                    if (this.tracker.passenger != null) {
+                        entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(0, this.tracker.passenger, this.tracker));
+                    }
+                    // CraftBukkit end
+
                     if (this.tracker instanceof EntityInsentient && ((EntityInsentient) this.tracker).bI() != null) {
                         entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(1, this.tracker, ((EntityInsentient) this.tracker).bI()));
                     }