diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
index 204d463..8da78e4 100755
--- a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
+++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
@@ -52,7 +52,7 @@ public class ChatHandler {
         }
 
         TagResolver placeholders = TagResolver.resolver(
-                Placeholder.component("message", parseMessageContent(player, modifiableString.string())),
+                Placeholder.component("message", parseMessageContent(player, message)),
                 Placeholder.component("sendername", player.name()),
                 Placeholder.parsed("receivername", target)
         );
@@ -81,7 +81,7 @@ public class ChatHandler {
             return; // the message was blocked
         }
 
-        Component messageComponent = parseMessageContent(player, modifiableString.string());
+        Component messageComponent = parseMessageContent(player, message);
         TagResolver placeholders = TagResolver.resolver(
                 Placeholder.component("message", messageComponent),
                 Placeholder.component("sendername", player.name()),
@@ -133,7 +133,7 @@ public class ChatHandler {
         TagResolver placeholders = TagResolver.resolver(
                 Placeholder.component("sender", senderName),
                 Placeholder.component("prefix", prefix),
-                Placeholder.component("message", parseMessageContent(player, modifiableString.string())),
+                Placeholder.component("message", parseMessageContent(player, message)),
                 Placeholder.parsed("server", Bukkit.getServerName())
         );
 
@@ -165,7 +165,7 @@ public class ChatHandler {
 
         TagResolver placeholders = TagResolver.resolver(
                 Placeholder.component("sender", senderName),
-                Placeholder.component("message", parseMessageContent(player, modifiableString.string())),
+                Placeholder.component("message", parseMessageContent(player, message)),
                 Placeholder.parsed("server", Bukkit.getServerName()),
                 Placeholder.parsed("channel", channel.getChannelName())
         );
diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
index 19d2526..ca70031 100755
--- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
+++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
@@ -88,7 +88,7 @@ public class ChatListener implements Listener {
             return; // the message was blocked
         }
 
-        input = render(player, plainTextComponentSerializer.deserialize(modifiableString.string()));
+        input = render(player, input);
         for (Player receiver : receivers) {
             receiver.sendMessage(input);
         }
diff --git a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
index c9fb1a9..f3cefd0 100755
--- a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
@@ -132,7 +132,7 @@ public class ChatHandler {
                 Placeholder.component("sender", senderName),
                 Placeholder.component("sendername", senderName),
                 Placeholder.unparsed("partyname", party.getPartyName()),
-                Placeholder.component("message", parseMessageContent(player, modifiableString.string())),
+                Placeholder.component("message", parseMessageContent(player, message)),
                 Placeholder.unparsed("server", serverConnection.getServer().getServerInfo().getName())
         );