diff --git a/src/main/java/cc/reconnected/server/commands/TellCommand.java b/src/main/java/cc/reconnected/server/commands/TellCommand.java
index 67c48fa..904df6b 100644
--- a/src/main/java/cc/reconnected/server/commands/TellCommand.java
+++ b/src/main/java/cc/reconnected/server/commands/TellCommand.java
@@ -71,6 +71,7 @@ public class TellCommand {
                 Placeholder.component("message", parsedMessage.toText()));
 
         lastSender.put(targetName, source.getName());
+        lastSender.put(source.getName(), targetName);
 
         if (!source.getName().equals(targetName)) {
             source.sendMessage(text);