diff --git a/VelocityCore/src/de/steamwar/velocitycore/chat/ChatFormat.java b/VelocityCore/src/de/steamwar/velocitycore/chat/ChatFormat.java
index 91e5feda..28b4a725 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/chat/ChatFormat.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/chat/ChatFormat.java
@@ -61,7 +61,10 @@ public class ChatFormat {
         Component teamPrefix = Component.empty();
         if (TEAM_PREFIX_FORMATS.contains(format)) {
             if (useSwPrefix(user)) {
-                teamPrefix = withTeamHover(receiver, user, Chatter.SERIALIZER.deserialize("§eS§8W")).append(Component.text(" "));
+                teamPrefix = Chatter.SERIALIZER.deserialize("§eS§8W")
+                        .hoverEvent(HoverEvent.showText(receiver.parse(new Message("CHAT_HOVER_TEAM_CLICK", "SteamWar", "§e", "S§8W"))))
+                        .clickEvent(ClickEvent.suggestCommand("/team info SW"))
+                        .append(Component.text(" "));
             } else if (user.getTeam() != 0) {
                 Team team = Team.byId(user.getTeam());
                 teamPrefix = clickableTeam(receiver, team, Chatter.SERIALIZER.deserialize("§" + team.getTeamColor() + team.getTeamKuerzel())).append(Component.text(" "));