diff --git a/frontend/src/app/main/features.cljs b/frontend/src/app/main/features.cljs
index 1acffc3ea4..1cab3b49df 100644
--- a/frontend/src/app/main/features.cljs
+++ b/frontend/src/app/main/features.cljs
@@ -63,7 +63,7 @@
     ;; Ensure it's always enabled whenever render-wasm/v1 is active.
     (if (contains? features "render-wasm/v1")
       (conj features "text-editor/v2")
-      (disj features "text-editor/v2"))))
+      (disj features "text-editor/v2" "text-editor-wasm/v1"))))
 
 (defn get-enabled-features
   "An explicit lookup of enabled features for the current team"
diff --git a/frontend/src/app/util/text/content.cljs b/frontend/src/app/util/text/content.cljs
index a43ebac99f..4c14786a8e 100644
--- a/frontend/src/app/util/text/content.cljs
+++ b/frontend/src/app/util/text/content.cljs
@@ -14,7 +14,8 @@
 (defn dom->cljs
   "Gets the editor content from a DOM structure"
   [root]
-  (fd/create-root root))
+  (when (some? root)
+    (fd/create-root root)))
 
 (defn cljs->dom
   "Sets the editor content from a CLJS structure"