diff --git a/src/dom_components/model/ComponentTextNode.js b/src/dom_components/model/ComponentTextNode.js
index 9b79a9bf5..7359713bc 100644
--- a/src/dom_components/model/ComponentTextNode.js
+++ b/src/dom_components/model/ComponentTextNode.js
@@ -1,4 +1,5 @@
 import Component from './Component';
+import { escape } from 'utils/mixins';
 
 export default Component.extend(
   {
@@ -12,12 +13,8 @@ export default Component.extend(
     },
 
     toHTML() {
-      return this.get('content')
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#039;');
+      const cnt = this.get('content');
+      return escape(cnt);
     }
   },
   {