diff --git a/Client/Client.cs b/Client/Client.cs
index 29833b2..3a6e12f 100644
--- a/Client/Client.cs
+++ b/Client/Client.cs
@@ -76,6 +76,7 @@ namespace Client
                 expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
             }
 
+            ar.AsyncWaitHandle.WaitOne();
             stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete), null);
         }
 
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index 01b723a..9ca8855 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -88,9 +88,9 @@ namespace Server.Models
 
 
                 }
+                ar.AsyncWaitHandle.WaitOne();
                 // start reading for a new message
                 stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null);
-
             }
             catch (IOException e)
             {
@@ -186,7 +186,7 @@ namespace Server.Models
                     sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage());
                     ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
 
-                    Task.Run(SendLobbyData);
+                    //Task.Run(SendLobbyData);
 
                     serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.RANDOMWORD, new
                     {
@@ -208,6 +208,7 @@ namespace Server.Models
             string result = await WaitForData();
             if(result == "bruh momento")
             {
+              
             }
         }