diff --git a/src/topics/create.js b/src/topics/create.js
index ce21dc4063..de3f8bd36c 100644
--- a/src/topics/create.js
+++ b/src/topics/create.js
@@ -51,7 +51,7 @@ module.exports = function (Topics) {
 			`cid:${topicData.cid}:uid:${topicData.uid}:tids`,
 		];
 		const countedSortedSetKeys = [
-			...['views', 'posts', 'votes'].map(prop => `${topicData.cid === -1 ? 'topicsRemote' : 'topics'}:${prop}`),
+			...['views', 'posts', 'votes'].map(prop => `${utils.isNumber(tid) ? 'topics' : 'topicsRemote'}:${prop}`),
 			`cid:${topicData.cid}:tids:votes`,
 			`cid:${topicData.cid}:tids:posts`,
 			`cid:${topicData.cid}:tids:views`,
diff --git a/src/topics/delete.js b/src/topics/delete.js
index 38fe7e0f11..903fba4ef5 100644
--- a/src/topics/delete.js
+++ b/src/topics/delete.js
@@ -93,11 +93,9 @@ module.exports = function (Topics) {
 			db.sortedSetsRemove([
 				'topics:tid',
 				'topics:recent',
-				'topics:posts',
-				'topics:views',
-				'topics:votes',
 				'topics:scheduled',
 			], tid),
+			db.sortedSetsRemove(['views', 'posts', 'votes'].map(prop => `${utils.isNumber(tid) ? 'topics' : 'topicsRemote'}:${prop}`), tid),
 			deleteTopicFromCategoryAndUser(tid),
 			Topics.deleteTopicTags(tid),
 			Topics.events.purge(tid),