diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 06d97baf02..6b871207f5 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -289,7 +289,7 @@ define('composer', [
 		// https://github.com/NodeBB/NodeBB/issues/1951
 		// remove when 1951 is resolved
 
-		var title = postData.title.replace(/%/g, '%').replace(/,/g, ',');
+		var title = $('<div/>').text(postData.title).html().replace(/%/g, '&#37;').replace(/,/g, '&#44;');
 
 		var data = {
 			title: title,