diff --git a/src/controllers/admin.js b/src/controllers/admin.js
index 6666d0a950..279a63ab17 100644
--- a/src/controllers/admin.js
+++ b/src/controllers/admin.js
@@ -148,7 +148,7 @@ function filterAndRenderCategories(req, res, next, active) {
 }
 
 adminController.tags.get = function(req, res, next) {
-	topics.getTags(0, 99, function(err, tags) {
+	topics.getTags(0, 199, function(err, tags) {
 		if (err) {
 			return next(err);
 		}
diff --git a/src/controllers/tags.js b/src/controllers/tags.js
index fb97f1a24f..53b418f6b9 100644
--- a/src/controllers/tags.js
+++ b/src/controllers/tags.js
@@ -49,7 +49,7 @@ tagsController.getTag = function(req, res, next) {
 };
 
 tagsController.getTags = function(req, res, next) {
-	topics.getTags(0, 100, function(err, tags) {
+	topics.getTags(0, 99, function(err, tags) {
 		if (err) {
 			return next(err);
 		}
diff --git a/src/topics/tags.js b/src/topics/tags.js
index 4cd650850f..7723fb6640 100644
--- a/src/topics/tags.js
+++ b/src/topics/tags.js
@@ -119,8 +119,8 @@ module.exports = function(Topics) {
 		db.sortedSetRemove('tags:topic:count', tag);
 	};
 
-	Topics.getTags = function(start, count, callback) {
-		db.getSortedSetRevRangeByScoreWithScores('tags:topic:count', start, count, '+inf', 1, function(err, tags) {
+	Topics.getTags = function(start, end, callback) {
+		db.getSortedSetRevRangeWithScores('tags:topic:count', start, end, function(err, tags) {
 			if (err) {
 				return callback(err);
 			}