diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClanCommand.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClanCommand.java
index 1382417..35b6923 100644
--- a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClanCommand.java
+++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClanCommand.java
@@ -7,7 +7,6 @@ import me.freezy.plugins.papermc.blazesmp.module.manager.Clans;
 import me.freezy.plugins.papermc.blazesmp.module.manager.L4M4;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextDecoration;
-import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -20,6 +19,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
+
 public class ClanCommand extends SimpleCommand {
 
     private final Clans clans;
@@ -66,7 +67,8 @@ public class ClanCommand extends SimpleCommand {
                 }
                 String clanName = args[1];
                 String clanTag = String.join(" ", Arrays.copyOfRange(args, 2, args.length));
-                Component tagComponent = miniMessage().deserialize(clanTag);
+                String formattedMessage = clanTag.replaceAll("<click:[^>]+>(.*?)</click>", "$1");
+                Component tagComponent = miniMessage().deserialize(formattedMessage);
 
                 Clan newClan = new Clan(clanName, tagComponent, playerUUID);
                 clans.addClan(newClan);
@@ -678,6 +680,7 @@ public class ClanCommand extends SimpleCommand {
                 }
                 String whatToModify = args[1].toLowerCase();
                 String newValue = String.join(" ", Arrays.copyOfRange(args, 2, args.length));
+                String formattedMessage = newValue.replaceAll("<click:[^>]+>(.*?)</click>", "$1");
                 Clan currentClan = clans.getClanByMember(playerUUID);
                 if (currentClan == null) {
                     player.sendMessage(miniMessage().deserialize(L4M4.get("error.clan_not_found")));
@@ -692,11 +695,11 @@ public class ClanCommand extends SimpleCommand {
                         ));
                     }
                     case "tag" -> {
-                        Component newTag = miniMessage().deserialize(newValue);
+                        Component newTag = miniMessage().deserialize(formattedMessage);
                         currentClan.setTag(newTag);
                         currentClan.save();
                         player.sendMessage(miniMessage().deserialize(
-                                String.format("<green>Clan tag changed to %s.</green>", newValue)
+                                String.format("<green>Clan tag changed to %s.</green>", formattedMessage)
                         ));
                     }
                     default -> player.sendMessage(miniMessage().deserialize(L4M4.get("error.modify_invalid")));
@@ -778,7 +781,8 @@ public class ClanCommand extends SimpleCommand {
                                 .filter(s -> s.startsWith(args[1]))
                                 .collect(Collectors.toList());
                     }
-                    default -> {}
+                    default -> {
+                    }
                 }
             } else if (clans.isVice(playerUUID)) {
                 switch (args[0].toLowerCase()) {
@@ -809,7 +813,8 @@ public class ClanCommand extends SimpleCommand {
                         List<String> joins = getClanJoinRequests(args, playerUUID);
                         if (joins != null) return joins;
                     }
-                    default -> {}
+                    default -> {
+                    }
                 }
             } else {
                 switch (args[0].toLowerCase()) {
@@ -829,7 +834,8 @@ public class ClanCommand extends SimpleCommand {
                     case "create" -> {
                         return Collections.singletonList("<name>");
                     }
-                    default -> {}
+                    default -> {
+                    }
                 }
             }
         }
diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerChatListener.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerChatListener.java
index 983c574..98517a4 100644
--- a/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerChatListener.java
+++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerChatListener.java
@@ -13,7 +13,10 @@ public class PlayerChatListener implements Listener {
     public void onChat(AsyncChatEvent event) {
         Player player = event.getPlayer();
 
-        Component messageComponent = MiniMessage.miniMessage().deserialize(PlainTextComponentSerializer.plainText().serialize(event.message()));
+        String message = PlainTextComponentSerializer.plainText().serialize(event.message());
+        String formattedMessage = message.replaceAll("<click:[^>]+>(.*?)</click>", "$1");
+
+        Component messageComponent = MiniMessage.miniMessage().deserialize(formattedMessage);
 
         Component chatComponent = Component.empty()
                 .append(player.playerListName())