diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index cd37a42..144707a 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -176,7 +176,7 @@ namespace Server.Models
                                 coords = JSONConvert.getCoordinates(payload),
                                 color = JSONConvert.getCanvasDrawingColor(payload)
                             };
-                            serverCom.SendToLobby(serverCom.GetLobbyForUser(User),JSONConvert.GetMessageToSend(JSONConvert.CANVAS,canvasData));
+                            serverCom.SendCanvasDataToLobby(serverCom.GetLobbyForUser(User),User.Username,JSONConvert.GetMessageToSend(JSONConvert.CANVAS,canvasData));
                             break;
 
                         case JSONConvert.CANVAS_RESET:
diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index 8822dba..ddf1e37 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -174,7 +174,8 @@ namespace Server.Models
                 {
                     foreach (ServerClient sc in serverClientsInlobbies[l])
                     {
-                        sc.sendMessage(message);
+                        if (sc.User.Username != username)
+                            sc.sendMessage(message);
                     }
                     break;
                 }