diff --git a/app/post_metadata.go b/app/post_metadata.go
index 0b4de04cd6..815d86fe91 100644
--- a/app/post_metadata.go
+++ b/app/post_metadata.go
@@ -32,28 +32,17 @@ func (a *App) InitPostMetadata() {
 }
 
 func (a *App) PreparePostListForClient(originalList *model.PostList) *model.PostList {
-	numPosts := len(originalList.Posts)
-
 	list := &model.PostList{
-		Posts: make(map[string]*model.Post, numPosts),
+		Posts: make(map[string]*model.Post, len(originalList.Posts)),
 		Order: originalList.Order, // Note that this uses the original Order array, so it isn't a deep copy
 	}
 
-	posts := make(chan *model.Post, numPosts)
+	for id, originalPost := range originalList.Posts {
+		post := a.PreparePostForClient(originalPost)
 
-	for _, originalPost := range originalList.Posts {
-		go func(originalPost *model.Post) {
-			posts <- a.PreparePostForClient(originalPost)
-		}(originalPost)
+		list.Posts[id] = post
 	}
 
-	for i := 0; i < numPosts; i++ {
-		post := <-posts
-		list.Posts[post.Id] = post
-	}
-
-	close(posts)
-
 	return list
 }