diff --git a/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java b/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java
index b312cee..9bc4e10 100644
--- a/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java
+++ b/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java
@@ -40,6 +40,7 @@ public class ScoreboardManager {
         if (!createdTeams.getOrDefault(player.getUniqueId(), List.of()).contains(role)) {
             dispatchPacket(UpdateTeamsPacket.create(role, playerNames), player);
             createdTeams.computeIfAbsent(player.getUniqueId(), k -> new ArrayList<>()).add(role);
+            roleMappings.computeIfAbsent(player.getUniqueId(), k -> new HashMap<>()).put(player.getUsername(), role);
         } else {
             roleMappings.getOrDefault(player.getUniqueId(), Map.of())
                     .entrySet().stream()