diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
index 379a274..f2bfcc3 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
@@ -184,6 +184,9 @@ public class ClientHandler implements Runnable {
     } else {
       //send msg to all clients who are not in a lobby.
       for (ClientHandler client : connectedClients) {
+        if(client.getClientUserName().equals(this.getClientUserName())){
+          continue;
+        }
         if (Lobby.clientIsInLobby(client) == -1) {
           client.sendMsgToClient(Protocol.printToClientChat + "$" + clientUserName + ": " + msg);
         }
@@ -213,6 +216,9 @@ public class ClientHandler implements Runnable {
    */
   public void broadcastChatMessageToAll(String msg) {
     for (ClientHandler client : connectedClients) {
+      if(client.getClientUserName().equals(this.getClientUserName())){
+        continue;
+      }
       client.sendMsgToClient(Protocol.printToClientChat + "$" + clientUserName + ": " + msg);
     }
   }