diff --git a/src/posts/edit.js b/src/posts/edit.js
index 453a10e9dd..c75f7f2379 100644
--- a/src/posts/edit.js
+++ b/src/posts/edit.js
@@ -112,7 +112,7 @@ module.exports = function (Posts) {
 			return {
 				tid: tid,
 				cid: topicData.cid,
-				title: validator.escape(String(topicData.title)),
+				title: topicData.title,
 				isMainPost: false,
 				renamed: false,
 				tagsupdated: false,
diff --git a/src/topics/create.js b/src/topics/create.js
index d1fe0c6da9..5d631cce27 100644
--- a/src/topics/create.js
+++ b/src/topics/create.js
@@ -209,8 +209,7 @@ module.exports = function (Topics) {
 	};
 
 	async function onNewPost(postData, data) {
-		const { tid } = postData;
-		const { uid } = postData;
+		const { tid, uid } = postData;
 		await Topics.markCategoryUnreadForAll(tid);
 		await Topics.markAsRead([tid], uid);
 		const [