diff --git a/app/post.go b/app/post.go
index 77bf9a19ae..2840f6c946 100644
--- a/app/post.go
+++ b/app/post.go
@@ -399,6 +399,7 @@ func (a *App) FillInPostProps(post *model.Post, channel *model.Channel) *model.A
 				team, err := a.Srv().Store.Team().Get(mentioned.TeamId)
 				if err != nil {
 					mlog.Error("Failed to get team of the channel mention", mlog.String("team_id", channel.TeamId), mlog.String("channel_id", channel.Id), mlog.Err(err))
+					continue
 				}
 				channelMentionsProp[mentioned.Name] = map[string]interface{}{
 					"display_name": mentioned.DisplayName,