diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index c24ec80d49..2194bde928 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -148,7 +148,7 @@ define('composer', ['taskbar', 'composer/controls', 'composer/uploads', 'compose
 
 			push({
 				pid: pid,
-				title: threadData.title,
+				title: $('<div/>').html(threadData.title).text(),
 				body: threadData.body,
 				modified: false,
 				isMain: threadData.isMain,
@@ -208,8 +208,6 @@ define('composer', ['taskbar', 'composer/controls', 'composer/uploads', 'compose
 					bodyEl = postContainer.find('textarea'),
 					draft = drafts.getDraft(postData.save_id);
 
-				postData.title = $('<div></div>').text(postData.title).html();
-
 				updateTitle(postData, postContainer);
 
 				if (allowTopicsThumbnail) {