diff --git a/app/post.go b/app/post.go
index 180ccbf7c8..1668c0c419 100644
--- a/app/post.go
+++ b/app/post.go
@@ -166,6 +166,10 @@ func (a *App) CreatePost(post *model.Post, channel *model.Channel, triggerWebhoo
 		return nil, err
 	}
 
+	if user.IsBot {
+		post.AddProp("from_bot", "true")
+	}
+
 	if a.License() != nil && *a.Config().TeamSettings.ExperimentalTownSquareIsReadOnly &&
 		!post.IsSystemMessage() &&
 		channel.Name == model.DEFAULT_CHANNEL &&