diff --git a/src/js/main.js b/src/js/main.js
index a5738b3..e0f1d02 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -211,9 +211,10 @@ $(function() {
     darkwire.encodeMessage(cleanedMessage, 'text').then((socketData) => {
       message.val('');
       $('#send-message-btn').removeClass('active');
+      // Add escaped message since message did not come from the server
       chat.addChatMessage({
         username: username,
-        message: cleanedMessage
+        message: escape(cleanedMessage)
       });
       socket.emit('new message', socketData);
     }).catch((err) => {