diff --git a/pkg/internal/services/events.go b/pkg/internal/services/events.go
index 511a0f7..4533bc2 100644
--- a/pkg/internal/services/events.go
+++ b/pkg/internal/services/events.go
@@ -170,9 +170,10 @@ func NotifyMessageEvent(members []models.ChannelMember, event models.Event) {
 		}
 	}
 
-	if len(event.Sender.Nick) == 0 {
-		user, err := authkit.GetUser(gap.Nx, event.SenderID)
-		if err == nil {
+	user, err := authkit.GetUser(gap.Nx, event.SenderID)
+	if err == nil {
+		event.Sender.Avatar = user.Avatar
+		if len(event.Sender.Nick) == 0 {
 			event.Sender.Nick = user.Nick
 		}
 	}