diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index 468fab0c72899cb45a860526efba5fba51fa18c2..a20da344b0345f2d1123acb19db9da71c5f3db0d 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -251,7 +251,7 @@ var FieldTextHtml = widget.extend({
             attr.translatable = 1;
         }
         if (session.debug) {
-            attr.debug = 1;
+            attr.debug = session.debug;
         }
 
         attr.lang = attr.enable_editor ? 'en_US' : this.session.user_context.lang;
diff --git a/addons/web_editor/views/iframe.xml b/addons/web_editor/views/iframe.xml
index 6ed1f39eddf661ddb22548f7862b03bdc233e551..b73611f545a464f543e2a8f5fcef3127cc5b99a1 100644
--- a/addons/web_editor/views/iframe.xml
+++ b/addons/web_editor/views/iframe.xml
@@ -40,7 +40,7 @@
                 if (window.top.odoo && !window.top.odoo[callback+"_updown"]) {
                     window.top.odoo[callback+"_updown"] = function (value, fields_values) {
                         var editable = document.getElementsByClassName("o_editable")[0];
-                        if (value !== editable.innerHTML) {
+                        if (editable && value !== editable.innerHTML) {
                             editable.innerHTML = value;
                         }
                     };