diff --git a/src/main/java/org/saturnclient/saturnclient/auth/SaturnSocket.java b/src/main/java/org/saturnclient/saturnclient/auth/SaturnSocket.java
index 11aef94..938a3d3 100644
--- a/src/main/java/org/saturnclient/saturnclient/auth/SaturnSocket.java
+++ b/src/main/java/org/saturnclient/saturnclient/auth/SaturnSocket.java
@@ -6,7 +6,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
 import net.minecraft.client.MinecraftClient;
 
 import org.saturnclient.saturnclient.SaturnClient;
@@ -149,16 +148,6 @@ public class SaturnSocket {
 
     public static void afterAuth() {
         PlayerTracker.initialize();
-
-        ClientReceiveMessageEvents.CHAT.register((message, signedMessage, sender, params, receptionTimestamp) -> {
-            String msg = message.getString();
-
-            if (msg.contains("$SATURN_RELOAD")) {
-                String name = sender.getName();
-                SaturnClient.LOGGER.info("Reloading player: " + name);
-                player(name, sender.getId().toString().replace("-", ""));
-            }
-        });
     }
 
     public static void setCloak(String cloakName) {
diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/SaturnReload.java b/src/main/java/org/saturnclient/saturnclient/mixin/SaturnReload.java
index c9d8b6a..e6f2356 100644
--- a/src/main/java/org/saturnclient/saturnclient/mixin/SaturnReload.java
+++ b/src/main/java/org/saturnclient/saturnclient/mixin/SaturnReload.java
@@ -1,6 +1,9 @@
 package org.saturnclient.saturnclient.mixin;
 
+import java.util.Map;
+
 import org.jetbrains.annotations.Nullable;
+import org.saturnclient.saturnclient.auth.SaturnSocket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,8 +19,15 @@ public class SaturnReload {
     @Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;Lnet/minecraft/client/gui/hud/MessageIndicator;)V", at = @At("HEAD"), cancellable = true)
     public void onAddMessage(Text message, @Nullable MessageSignatureData signatureData,
             @Nullable MessageIndicator indicator, CallbackInfo ci) {
-        if (message.toString().contains("$SATURN_RELOAD")) {
-            ci.cancel();
+        String msg = message.toString();
+        if (msg.contains("$SATURN_RELOAD")) {
+            for (Map.Entry<String, String> player : SaturnSocket.playerNames.entrySet()) {
+                String name = player.getKey();
+                if (msg.contains(name)) {
+                    SaturnSocket.player(name, player.getValue());
+                }
+                ci.cancel();
+            }
         }
     }
 }