diff --git a/Client/Client.cs b/Client/Client.cs
index 0a8e912..15e58a9 100644
--- a/Client/Client.cs
+++ b/Client/Client.cs
@@ -173,6 +173,7 @@ namespace Client
                     Debug.WriteLine("[CLIENT] Received weird identifier: " + id);
                     break;
             }
+            SendMessage(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE_RECEIVED,null));
 
         }
 
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index 6c4f282..c5c1aaa 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -192,12 +192,15 @@ namespace Server.Models
                     ServerCommunication.INSTANCE.JoinLobby(this.User,id, out isHost);
                     sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage(isHost));
                     ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
-
-                    serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.RANDOMWORD, new
+                    OnMessageReceivedOk = () =>
                     {
-                        id = serverCom.GetLobbyForUser(User).ID,
-                        word = JSONConvert.SendRandomWord("WordsForGame.json")
-                    }));
+                        serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.RANDOMWORD, new
+                        {
+                            id = serverCom.GetLobbyForUser(User).ID,
+                            word = JSONConvert.SendRandomWord("WordsForGame.json")
+                        }));
+                        OnMessageReceivedOk = null;
+                    };
                     break;
                 case LobbyIdentifier.LEAVE:
                     id = JSONConvert.GetLobbyID(payload);