diff --git a/backend/src/app/features/components_v2.clj b/backend/src/app/features/components_v2.clj
index ff7ad5866..584259020 100644
--- a/backend/src/app/features/components_v2.clj
+++ b/backend/src/app/features/components_v2.clj
@@ -275,6 +275,9 @@
                                             0
                                             gap)))
 
+                      (nil? (:name shape))
+                      (assoc :name (d/name (:type shape)))
+
                       ;; Fix broken fills
                       (seq (:fills shape))
                       (update :fills (fn [fills] (filterv valid-fill? fills)))