diff --git a/packages/components/src/Draft/Text/index.js b/packages/components/src/Draft/Text/index.js
index ecf2c120d62..bbf8f12508a 100644
--- a/packages/components/src/Draft/Text/index.js
+++ b/packages/components/src/Draft/Text/index.js
@@ -8,7 +8,7 @@ const Text = (props) => {
   for (let string of props.point.attributes.getAsArray('data-text')) {
     if (strings[props.language]['plugin.' + string])
       translated += strings[props.language]['plugin.' + string]
-    else translated += string
+    else translated += string.toString().replace(/"/g, '"')
     translated += ' '
   }
   // Handle muti-line text
@@ -18,13 +18,14 @@ const Text = (props) => {
     text.push(<tspan key={'tspan-' + key}>{lines.shift()}</tspan>)
     for (let line of lines) {
       key++
+      console.log('multi', line, typeof line)
       text.push(
         <tspan
           key={'tspan-' + key}
           x={props.point.x}
           dy={props.point.attributes.get('data-text-lineheight') || 12}
         >
-          {line}
+          {line.toString().replace(/&quot;/g, '"')}
         </tspan>
       )
     }
diff --git a/packages/components/src/Draft/TextOnPath/index.js b/packages/components/src/Draft/TextOnPath/index.js
index 9d92e7d8cac..1ca8cf13c85 100644
--- a/packages/components/src/Draft/TextOnPath/index.js
+++ b/packages/components/src/Draft/TextOnPath/index.js
@@ -8,7 +8,7 @@ const TextOnPath = (props) => {
   for (let string of props.path.attributes.getAsArray('data-text')) {
     if (strings[props.language]['plugin.' + string])
       translated += strings[props.language]['plugin.' + string]
-    else translated += string
+    else translated += string.toString().replace(/&quot;/g, '"')
     translated += ' '
   }
   let textPathProps = {