diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/bungeecore/listeners/ChatListener.java
index 205faadc..bd02b3d5 100644
--- a/src/de/steamwar/bungeecore/listeners/ChatListener.java
+++ b/src/de/steamwar/bungeecore/listeners/ChatListener.java
@@ -88,7 +88,8 @@ public class ChatListener extends BasicListener {
 
         AtomicBoolean noReceiver = new AtomicBoolean(true);
         receivers.filter(ChatSender::chatShown).forEach(player -> {
-            noReceiver.set(false);
+            if(sender.user().getId() != player.user().getId())
+                noReceiver.set(false);
             chatToReciever(player, user, format, finalMessage);
         });
 
@@ -102,7 +103,6 @@ public class ChatListener extends BasicListener {
                 chatToReciever(ChatSender.discordChannel(SteamwarDiscordBot.instance().getServerTeamChatListener()), user, format, finalMessage);
         } else if (noReceiver.get()) {
             sender.system("CHAT_NO_RECEIVER");
-            //TODO always 1 Receiver (own)
         }
     }