diff --git a/src/topics.js b/src/topics.js
index dc7929a6b7..ab3f4f6ffa 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -256,24 +256,11 @@ var async = require('async'),
 			}
 
 			async.parallel({
+				mainPost: function(next) {
+					Topics.getMainPost(tid, uid, next);
+				},
 				posts: function(next) {
-					posts.getPidsFromSet(set, start, end, reverse, function(err, pids) {
-						if (err) {
-							return next(err);
-						}
-
-						pids = [topicData.mainPid].concat(pids);
-						posts.getPostsByPids(pids, tid, function(err, posts) {
-							if (err) {
-								return next(err);
-							}
-							start = parseInt(start, 10);
-							for(var i=0; i<posts.length; ++i) {
-								posts[i].index = start + i + 1;
-							}
-							Topics.addPostData(posts, uid, next);
-						});
-					});
+					Topics.getTopicPosts(tid, set, start, end, uid, reverse, next);
 				},
 				category: function(next) {
 					Topics.getCategoryData(tid, next);
@@ -293,7 +280,7 @@ var async = require('async'),
 				}
 
 				topicData.category = results.category;
-				topicData.posts = results.posts;
+				topicData.posts = results.mainPost.concat(results.posts);
 				topicData.tags = results.tags;
 				topicData.thread_tools = results.threadTools;
 				topicData.pageCount = results.pageCount;