diff --git a/src/topics/data.js b/src/topics/data.js
index 9d153b5b78..6e7172bb5f 100644
--- a/src/topics/data.js
+++ b/src/topics/data.js
@@ -78,6 +78,12 @@ module.exports = function(Topics) {
 		db.setObjectField('topic:' + tid, field, value, callback);
 	};
 
+
+	Topics.setTopicFields = function(tid, data, callback) {
+		callback = callback || function() {};
+		db.setObject('topic:' + tid, data, callback);
+	};
+
 	Topics.deleteTopicField = function(tid, field, callback) {
 		db.deleteObjectField('topic:' + tid, field, callback);
 	};
diff --git a/src/topics/tools.js b/src/topics/tools.js
index 1cb02ae514..fd5321eb6b 100644
--- a/src/topics/tools.js
+++ b/src/topics/tools.js
@@ -242,7 +242,10 @@ module.exports = function(Topics) {
 					categories.incrementCategoryFieldBy(cid, 'topic_count', 1, next);
 				},
 				function (next) {
-					Topics.setTopicField(tid, 'cid', cid, next);
+					Topics.setTopicFields(tid, {
+						cid: cid,
+						oldCid: oldCid
+					}, next);
 				}
 			], function(err) {
 				if (err) {