diff --git a/src/api/utils.js b/src/api/utils.js
index 4597bed42b..67e496a5f5 100644
--- a/src/api/utils.js
+++ b/src/api/utils.js
@@ -94,9 +94,11 @@ utils.tokens.roll = async (token) => {
 
 	const updates = [
 		db.rename(`token:${token}`, `token:${newToken}`),
-		db.sortedSetRemove(`tokens:createtime`, token),
-		db.sortedSetRemove(`tokens:uid`, token),
-		db.sortedSetRemove(`tokens:lastSeen`, token),
+		db.sortedSetsRemove([
+			`tokens:createtime`,
+			`tokens:uid`,
+			`tokens:lastSeen`,
+		], token),
 		db.sortedSetAdd(`tokens:createtime`, createTime, newToken),
 		db.sortedSetAdd(`tokens:uid`, uid, newToken),
 	];
@@ -113,9 +115,11 @@ utils.tokens.roll = async (token) => {
 utils.tokens.delete = async (token) => {
 	await Promise.all([
 		db.delete(`token:${token}`),
-		db.sortedSetRemove(`tokens:createtime`, token),
-		db.sortedSetRemove(`tokens:uid`, token),
-		db.sortedSetRemove(`tokens:lastSeen`, token),
+		db.sortedSetsRemove([
+			`tokens:createtime`,
+			`tokens:uid`,
+			`tokens:lastSeen`,
+		], token),
 	]);
 };
 
diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index 8d5bee679e..e24ff064b9 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -45,8 +45,7 @@ Auth.getLoginStrategies = function () {
 };
 
 Auth.verifyToken = async function (token, done) {
-	const tokens = await api.utils.tokens.list();
-	const tokenObj = tokens.filter((t => t.token === token)).pop();
+	const tokenObj = await api.utils.tokens.get(token);
 	const uid = tokenObj ? tokenObj.uid : undefined;
 
 	if (uid !== undefined) {