diff --git a/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/CivChat2Manager.java b/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/CivChat2Manager.java
index 785203954..65e1b1148 100644
--- a/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/CivChat2Manager.java
+++ b/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/CivChat2Manager.java
@@ -431,4 +431,8 @@ public class CivChat2Manager {
 	public void removeCustomName(UUID player) {
 		customNames.remove(player);
 	}
+
+	public ScoreboardHUD getScoreboardHUD() {
+		return scoreboardHUD;
+	}
 }
diff --git a/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java b/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java
index 16dfc8ced..e9328d5a5 100644
--- a/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java
+++ b/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java
@@ -72,6 +72,9 @@ public class CivChat2Listener implements Listener {
 				p.sendMessage(playerJoinEvent.getPlayer().getDisplayName() + ChatColor.YELLOW + " has joined the game");
 			}
 		}
+		
+		// Set current chat group in scoreboard
+		chatman.getScoreboardHUD().updateScoreboardHUD(playerJoinEvent.getPlayer());
 
 		if (CivChat2.getInstance().getPluginConfig().getChatRangeWarn() && !playerJoinEvent.getPlayer().hasPlayedBefore()) {
 			localWarn.add(playerJoinEvent.getPlayer().getUniqueId());