diff --git a/src/main/java/xyz/nucleoid/plasmid/api/game/common/team/TeamManager.java b/src/main/java/xyz/nucleoid/plasmid/api/game/common/team/TeamManager.java
index 55e9ea39..926270e6 100644
--- a/src/main/java/xyz/nucleoid/plasmid/api/game/common/team/TeamManager.java
+++ b/src/main/java/xyz/nucleoid/plasmid/api/game/common/team/TeamManager.java
@@ -138,6 +138,9 @@ public boolean addPlayerTo(PlayerRef player, GameTeamKey team) {
         }
 
         this.playerToTeam.put(player.id(), team);
+        for (var gameSpacePlayer : gameSpace.getPlayers()) {
+            this.sendTeamsToPlayer(gameSpacePlayer);
+        }
 
         var state = this.teamState(team);
         if (state.allPlayers.add(player)) {
@@ -192,6 +195,7 @@ public boolean removePlayerFrom(PlayerRef player, GameTeamKey team) {
 
         var entity = state.onlinePlayers.getEntity(player.id());
         if (entity != null) {
+            this.sendRemoveTeamsForPlayer(entity);
             this.removeOnlinePlayer(entity, state);
         }
         return true;