diff --git a/ClientApp/Utils/Client.cs b/ClientApp/Utils/Client.cs
index a96a2ab..4b347d5 100644
--- a/ClientApp/Utils/Client.cs
+++ b/ClientApp/Utils/Client.cs
@@ -190,6 +190,9 @@ namespace ClientApp.Utils
                 expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
             }
 
+            if (ar == null || (!ar.IsCompleted) || (!this.stream.CanRead) || !this.client.Connected)
+                return;
+            ar.AsyncWaitHandle.WaitOne();
             this.stream.BeginRead(this.buffer, 0, this.buffer.Length, new AsyncCallback(OnRead), null);
 
         }
diff --git a/DoctorApp/Utils/Client.cs b/DoctorApp/Utils/Client.cs
index 1087346..20b3137 100644
--- a/DoctorApp/Utils/Client.cs
+++ b/DoctorApp/Utils/Client.cs
@@ -136,6 +136,7 @@ namespace DoctorApp.Utils
 
             if (ar == null || (!ar.IsCompleted) || (!this.stream.CanRead) || !this.client.Connected)
                 return;
+            ar.AsyncWaitHandle.WaitOne();
             this.stream.BeginRead(this.buffer, 0, this.buffer.Length, new AsyncCallback(OnRead), null);
 
         }
diff --git a/DoctorApp/ViewModels/ClientInfoViewModel.cs b/DoctorApp/ViewModels/ClientInfoViewModel.cs
index 4b652a5..75de46a 100644
--- a/DoctorApp/ViewModels/ClientInfoViewModel.cs
+++ b/DoctorApp/ViewModels/ClientInfoViewModel.cs
@@ -77,6 +77,7 @@ namespace DoctorApp.ViewModels
 
             ChatToAll = new RelayCommand<object>((parameter) =>
             {
+                Debug.WriteLine("[CLIENTINFOVIEWMODEL] sending message to all clients");
                 this.parent?.SendToAllClients(((TextBox)parameter).Text);
             });
 
diff --git a/DoctorApp/Views/ClientInfoView.xaml b/DoctorApp/Views/ClientInfoView.xaml
index 5057f24..c3e6bca 100644
--- a/DoctorApp/Views/ClientInfoView.xaml
+++ b/DoctorApp/Views/ClientInfoView.xaml
@@ -57,6 +57,7 @@
         <ListBox Name="ChatBox"  ItemsSource="{Binding PatientInfo.ChatLog}" Grid.Column="1" Margin="59,41,0,0" Grid.RowSpan="3"/>
         <TextBox Name="textBox_Chat" Grid.Column="1" HorizontalAlignment="Left" Margin="59,10,0,0" Grid.Row="3" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="235"/>
         <Button x:Name="Send" Content="Send" Grid.Column="1" HorizontalAlignment="Left" Margin="59,33,0,0" Grid.Row="3" VerticalAlignment="Top" Command="{Binding Chat}" CommandParameter="{Binding ElementName=textBox_Chat}"/>
+        <Button x:Name="SendToAll" Content="Send to all clients" Grid.Column="1" HorizontalAlignment="Left" Margin="107,33,0,0" Grid.Row="3" VerticalAlignment="Top" Command="{Binding ChatToAll}" CommandParameter="{Binding ElementName=textBox_Chat}"/>
         <Button Content="Start Session" Grid.Column="1" HorizontalAlignment="Left" Margin="69,86,0,0" Grid.Row="3" VerticalAlignment="Top" Width="97" Command="{Binding StartSession}" CommandParameter=""/>
         <Button Content="Stop Session" Grid.Column="1" HorizontalAlignment="Left" Margin="187,86,0,0" Grid.Row="3" VerticalAlignment="Top" Width="97" Command="{Binding StopSession}" CommandParameter=""/>
         <TextBox x:Name="textBox_SetResistance" Grid.Column="1" HorizontalAlignment="Left" Margin="69,128,0,0" Grid.Row="3" TextWrapping="Wrap" VerticalAlignment="Top" Width="97"/>