diff --git a/frontend/src/app/main/ui/shapes/text.cljs b/frontend/src/app/main/ui/shapes/text.cljs
index 89802ca81..9a7c50c09 100644
--- a/frontend/src/app/main/ui/shapes/text.cljs
+++ b/frontend/src/app/main/ui/shapes/text.cljs
@@ -35,5 +35,8 @@
 
     ;; Old components can have texts without position data that must be rendered via foreign key
     (cond
-      (some? position-data) [:> svg/text-shape props]
-      is-component?             [:> fo/text-shape props])))
+      (some? position-data)
+      [:> svg/text-shape props]
+
+      (or (nil? position-data) is-component?)
+      [:> fo/text-shape props])))