diff --git a/src/UI/Components/JustHTML.js b/src/UI/Components/JustHTML.js
index b1233d69..ace8548f 100644
--- a/src/UI/Components/JustHTML.js
+++ b/src/UI/Components/JustHTML.js
@@ -15,4 +15,13 @@ export default def(class JustHTML extends Component {
             $(this.dom_).find('span').html(html);
         });
     }
+
+    _set_dom_based_on_render_mode({ property_values }) {
+        if ( property_values.no_shadow ) {
+            this.dom_ = this;
+            return;
+        }
+
+        return super._set_dom_based_on_render_mode();
+    }
 });