diff --git a/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java
index 2b8ed28..6c072a1 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java
@@ -7,15 +7,8 @@ import land.chipmunk.chipmunkmod.listeners.Listener;
 import land.chipmunk.chipmunkmod.listeners.ListenerManager;
 import land.chipmunk.chipmunkmod.modules.*;
 import land.chipmunk.chipmunkmod.modules.custom_chat.CustomChat;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandRegistryAccess;
 import net.minecraft.command.CommandSource;
-import net.minecraft.network.encryption.NetworkEncryptionUtils;
-import net.minecraft.network.message.LastSeenMessagesCollector;
-import net.minecraft.network.message.MessageBody;
-import net.minecraft.network.message.MessageChain;
-import net.minecraft.network.message.MessageSignatureData;
-import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
 import net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket;
 import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
 import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket;
@@ -31,8 +24,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.time.Instant;
-
 @Mixin(value = net.minecraft.client.network.ClientPlayNetworkHandler.class, priority = 1001)
 public class ClientPlayNetworkHandlerMixin {
     @Final
@@ -42,10 +33,6 @@ public class ClientPlayNetworkHandlerMixin {
     @Shadow
     private DynamicRegistryManager.Immutable combinedDynamicRegistries;
     @Shadow
-    private LastSeenMessagesCollector lastSeenMessagesCollector;
-    @Shadow
-    private MessageChain.Packer messagePacker;
-    @Shadow
     private CommandDispatcher<CommandSource> commandDispatcher;
 
     @Inject(method = "onGameJoin", at = @At("TAIL"))
@@ -118,29 +105,18 @@ public class ClientPlayNetworkHandlerMixin {
     @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
     private void sendChatMessage(String chatText, CallbackInfo ci) {
         final CommandManager commandManager = CommandManager.INSTANCE;
-
-        final String secret = String.valueOf(Chat.secret);
-
         if (chatText.startsWith(commandManager.prefix)) {
             commandManager.executeCommand(chatText.substring(commandManager.prefix.length()));
-
-            ci.cancel();
-        } else if (!chatText.startsWith("/") && !chatText.startsWith(secret)) {
-            CustomChat.INSTANCE.chat(chatText);
-
             ci.cancel();
+            return;
         }
 
-        if (chatText.startsWith(secret)) {
-            final String content = chatText.substring(secret.length());
-
-            Instant instant = Instant.now();
-            long l = NetworkEncryptionUtils.SecureRandomUtil.nextLong();
-            LastSeenMessagesCollector.LastSeenMessages lastSeenMessages = this.lastSeenMessagesCollector.collect();
-            MessageSignatureData messageSignatureData = this.messagePacker.pack(new MessageBody(content, instant, l, lastSeenMessages.lastSeen()));
-            MinecraftClient.getInstance().getNetworkHandler().sendPacket(new ChatMessageC2SPacket(content, instant, l, messageSignatureData, lastSeenMessages.update()));
-
-            ci.cancel();
+        if (Chat.NEXT_CHAT_PLAYER.get()) {
+            Chat.NEXT_CHAT_PLAYER.set(false);
+            return;
         }
+
+        CustomChat.INSTANCE.chat(chatText);
+        ci.cancel();
     }
 }
diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/Chat.java b/src/main/java/land/chipmunk/chipmunkmod/modules/Chat.java
index 2f56502..26f6957 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/modules/Chat.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/modules/Chat.java
@@ -4,15 +4,15 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 
 public class Chat {
-    public static double secret = Math.random();
+    public static final ThreadLocal<Boolean> NEXT_CHAT_PLAYER = ThreadLocal.withInitial(() -> false);
 
     public static void sendChatMessage (String message) { sendChatMessage(message, false); }
     public static void sendChatMessage (String message, boolean usePlayerChat) {
         if (message == null) return;
 
-        final ClientPlayNetworkHandler networkHandler = MinecraftClient.getInstance().getNetworkHandler();
+        if (usePlayerChat) NEXT_CHAT_PLAYER.set(true);
 
-        if (usePlayerChat) networkHandler.sendChatMessage(secret + message);
-        else networkHandler.sendChatMessage(message);
+        final ClientPlayNetworkHandler networkHandler = MinecraftClient.getInstance().getNetworkHandler();
+        networkHandler.sendChatMessage(message);
     }
 }