diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezrichtext.js b/src/bundle/Resources/public/js/scripts/fieldType/ezrichtext.js
index 0db472bae6..811c790226 100644
--- a/src/bundle/Resources/public/js/scripts/fieldType/ezrichtext.js
+++ b/src/bundle/Resources/public/js/scripts/fieldType/ezrichtext.js
@@ -166,12 +166,12 @@
                 return body.innerHTML;
             };
 
-            root.innerHTML = xhtmlify(data).replace(xhtmlNamespace, ezNamespace);
+            root.innerHTML = data;
             doc.appendChild(root);
 
             [...doc.querySelectorAll('[data-ezelement="ezembed"]')].forEach(emptyEmbed);
 
-            event.target.closest('.ez-data-source').querySelector('textarea').value = root.innerHTML;
+            event.target.closest('.ez-data-source').querySelector('textarea').value = xhtmlify(root.innerHTML).replace(xhtmlNamespace, ezNamespace);
         });
 
         const validator = new EzRichTextValidator({