diff --git a/public/src/forum/category.js b/public/src/forum/category.js
index b0dff6f486..62c6e0f59f 100644
--- a/public/src/forum/category.js
+++ b/public/src/forum/category.js
@@ -91,7 +91,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 			addActiveUser(data);
 
 			socket.emit('categories.getPageCount', templates.get('category_id'), function(err, newPageCount) {
-				pagination.recreatePaginationLinks('category', newPageCount);
+				pagination.recreatePaginationLinks(newPageCount);
 			});
 
 			$('#topics-container span.timeago').timeago();
diff --git a/public/src/forum/pagination.js b/public/src/forum/pagination.js
index dec14202f2..3a95d250af 100644
--- a/public/src/forum/pagination.js
+++ b/public/src/forum/pagination.js
@@ -30,7 +30,10 @@ define(function() {
 	pagination.recreatePaginationLinks = function(newPageCount) {
 		pagination.pageCount = parseInt(newPageCount, 10);
 
-		var pagesToShow = [1, pagination.pageCount];
+		var pagesToShow = [1];
+		if(pagination.pageCount !== 1) {
+			pagesToShow.push(pagination.pageCount);
+		}
 
 		var previous = pagination.currentPage - 1;
 		var next = pagination.currentPage + 1;
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 822ab3b2ca..d83b62218f 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -1065,9 +1065,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 
 	function onNewPostPagination(data) {
 		var posts = data.posts;
-		socket.emit('topics.getPageCount', tid, function(err, newPageCount) {
+		socket.emit('topics.getPageCount', templates.get('topic_id'), function(err, newPageCount) {
 
-			pagination.recreatePaginationLinks('topic', newPageCount);
+			pagination.recreatePaginationLinks(newPageCount);
 
 			if(pagination.currentPage === pagination.pageCount) {
 				createNewPosts(data);