diff --git a/qtc-net-client-2/Forms/ChatRoom.cs b/qtc-net-client-2/Forms/ChatRoom.cs
index 6be6884..bb6a8dc 100644
--- a/qtc-net-client-2/Forms/ChatRoom.cs
+++ b/qtc-net-client-2/Forms/ChatRoom.cs
@@ -194,11 +194,15 @@ namespace qtc_net_client_2.Forms
                 {
                     var ctrl = new ChatMessageControl()
                     {
-                        Avatar = ilProfileImages.Images[userId] ?? ilProfileImages.Images[0],
                         Username = message.Split(':')[0],
                         Message = message.Split(':')[1].Trim(),
                         Width = fpnlMessages.ClientSize.Width - SystemInformation.VerticalScrollBarWidth
                     };
+
+                    if(ilProfileImages.Images.ContainsKey(userId))
+                        ctrl.Avatar = ilProfileImages.Images[userId];
+                    else ctrl.Avatar = null;
+
                     ctrl.Height = ctrl.CalculateHeight(ctrl.Width);
 
                     fpnlMessages.Controls.Add(ctrl);