diff --git a/common/src/app/common/types/shape_tree.cljc b/common/src/app/common/types/shape_tree.cljc
index 928a5ed66..aaaab912b 100644
--- a/common/src/app/common/types/shape_tree.cljc
+++ b/common/src/app/common/types/shape_tree.cljc
@@ -382,7 +382,7 @@
                     parent-id
 
                     (nil? frame-id)
-                    (dm/get-in objects [parent-id :frame-id])
+                    (dm/get-in objects [parent-id :frame-id] uuid/zero)
 
                     :else
                     frame-id)]
diff --git a/frontend/src/app/main/data/workspace/libraries_helpers.cljs b/frontend/src/app/main/data/workspace/libraries_helpers.cljs
index 6aa83d582..a1d7644c3 100644
--- a/frontend/src/app/main/data/workspace/libraries_helpers.cljs
+++ b/frontend/src/app/main/data/workspace/libraries_helpers.cljs
@@ -931,7 +931,7 @@
 
         [_ new-shapes _]
         (ctst/clone-object component-shape
-                           (:id parent-shape)
+                           (:id component-parent-shape)
                            (get component-page :objects)
                            update-new-shape
                            update-original-shape)