diff --git a/src/main/java/rip/iwakura/civilcore/commands/TeamChatCommand.java b/src/main/java/rip/iwakura/civilcore/commands/TeamChatCommand.java
index f1a5e66..b5141b7 100644
--- a/src/main/java/rip/iwakura/civilcore/commands/TeamChatCommand.java
+++ b/src/main/java/rip/iwakura/civilcore/commands/TeamChatCommand.java
@@ -70,14 +70,14 @@ public class TeamChatCommand implements CommandExecutor {
       civilCore.teamChatRegister.remove(p);
     }*/
 
-    String formatted = String.format("%s%s: %s", getPrefix(player_name, inTeamChat) + " ", player_name, message);
-
     if (!inTeamChat) {
       civilCore.teamChatRegister.remove(p);
+      String formatted = String.format("%s%s: %s", getPrefix(player_name, inTeamChat) + " ", player_name, message);
       Bukkit.broadcastMessage(formatted);
       civilCore.teamChatRegister.add(p);
     } else {
       civilCore.teamChatRegister.add(p);
+      String formatted = String.format("%s%s: %s", getPrefix(player_name, inTeamChat) + " ", player_name, message);
       List<DbPlayer> players = civilCore.db.getPlayersInTeam(dbPlayer.team.name);
 
       if (players == null) return true;