diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java
index ee740d610..6d47e7f03 100644
--- a/src/main/java/net/minestom/server/entity/Entity.java
+++ b/src/main/java/net/minestom/server/entity/Entity.java
@@ -321,7 +321,11 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler
         }
         playerConnection.sendPacket(getMetadataPacket());
         // Passenger
-        if (hasPassenger()) {
+        final Set<Entity> passengers = this.passengers;
+        if (!passengers.isEmpty()) {
+            for (Entity passenger : passengers) {
+                passenger.addViewer(player);
+            }
             playerConnection.sendPacket(getPassengersPacket());
         }
         // Head position