diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java
index 2a175e6a3..80f6de3ce 100644
--- a/src/main/java/net/minestom/server/entity/Entity.java
+++ b/src/main/java/net/minestom/server/entity/Entity.java
@@ -348,10 +348,19 @@ public class Entity implements Viewable, EventHandler, DataContainer, Permission
         playerConnection.sendPacket(getVelocityPacket());
         playerConnection.sendPacket(getMetadataPacket());
 
+        // Passenger
         if (hasPassenger()) {
             playerConnection.sendPacket(getPassengersPacket());
         }
 
+        // Head position
+        {
+            EntityHeadLookPacket entityHeadLookPacket = new EntityHeadLookPacket();
+            entityHeadLookPacket.entityId = getEntityId();
+            entityHeadLookPacket.yaw = position.getYaw();
+            playerConnection.sendPacket(entityHeadLookPacket);
+        }
+
         return true;
     }
 
diff --git a/src/main/java/net/minestom/server/entity/LivingEntity.java b/src/main/java/net/minestom/server/entity/LivingEntity.java
index 4f400d019..c10c4bd26 100644
--- a/src/main/java/net/minestom/server/entity/LivingEntity.java
+++ b/src/main/java/net/minestom/server/entity/LivingEntity.java
@@ -552,6 +552,11 @@ public class LivingEntity extends Entity implements EquipmentHandler {
         final PlayerConnection playerConnection = player.getPlayerConnection();
         playerConnection.sendPacket(getEquipmentsPacket());
         playerConnection.sendPacket(getPropertiesPacket());
+
+        if (getTeam() != null){
+            playerConnection.sendPacket(getTeam().createTeamsCreationPacket());
+        }
+
         return true;
     }
 
diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java
index 93d6f8e04..050d5eeb7 100644
--- a/src/main/java/net/minestom/server/entity/Player.java
+++ b/src/main/java/net/minestom/server/entity/Player.java
@@ -593,13 +593,12 @@ public class Player extends LivingEntity implements CommandSender {
 
     @Override
     public boolean addViewer0(@NotNull Player player) {
-        if (player == this || !super.addViewer0(player)) {
+        if (player == this) {
             return false;
         }
-
         PlayerConnection viewerConnection = player.getPlayerConnection();
-        showPlayer(viewerConnection);
-        return true;
+        viewerConnection.sendPacket(getAddPlayerToList());
+        return super.addViewer0(player);
     }
 
     @Override