diff --git a/app/notification.go b/app/notification.go
index 70f60dd42d..910748cd32 100644
--- a/app/notification.go
+++ b/app/notification.go
@@ -163,7 +163,7 @@ func (a *App) SendNotifications(post *model.Post, team *model.Team, channel *mod
 	if post.IsSystemMessage() {
 		senderName = utils.T("system.message.name")
 	} else {
-		if value, ok := post.Props["override_username"]; ok && post.Props["from_webhook"] == "true" {
+		if value, ok := post.Props["override_username"]; ok && post.Props["from_webhook"] == "true" && channel.Type != model.CHANNEL_DIRECT {
 			senderName = value.(string)
 			senderUsername = value.(string)
 		} else {