diff --git a/frontend/src/app/main/data/workspace/texts.cljs b/frontend/src/app/main/data/workspace/texts.cljs
index b1903ec5c5..0108413e48 100644
--- a/frontend/src/app/main/data/workspace/texts.cljs
+++ b/frontend/src/app/main/data/workspace/texts.cljs
@@ -978,7 +978,8 @@
                                      (select-keys shape [:selrect :points :width :height]))
               content-has-text? (v2-content-has-text? content)
               prev-content-has-text? (v2-content-has-text? prev-content)
-              new-size (when (and (not= :fixed (:grow-type shape))
+              grow-type (:grow-type shape)
+              new-size (when (and (not= :fixed grow-type)
                                   content-has-text?)
                          (dwwt/get-wasm-text-new-size shape content))
               ;; New shapes: single undo on finalize only (no per-keystroke undo)
diff --git a/frontend/src/app/render_wasm/shape.cljs b/frontend/src/app/render_wasm/shape.cljs
index 7809d5ca0f..09a853cf33 100644
--- a/frontend/src/app/render_wasm/shape.cljs
+++ b/frontend/src/app/render_wasm/shape.cljs
@@ -332,9 +332,10 @@
 
 (defn process-shape-changes!
   [objects shape-changes]
-  (->> (rx/from shape-changes)
-       (rx/mapcat (fn [[shape-id props]] (process-shape! (get objects shape-id) props)))
-       (rx/subs! #(api/request-render "set-wasm-attrs"))))
+  (when (seq shape-changes)
+    (->> (rx/from shape-changes)
+         (rx/mapcat (fn [[shape-id props]] (process-shape! (get objects shape-id) props)))
+         (rx/subs! #(api/request-render "set-wasm-attrs")))))
 
 ;; `conj` empty set initialization
 (def conj* (fnil conj (d/ordered-set)))