diff --git a/frontend/src/app/main/data/workspace/libraries_helpers.cljs b/frontend/src/app/main/data/workspace/libraries_helpers.cljs
index 895521856..9538498ad 100644
--- a/frontend/src/app/main/data/workspace/libraries_helpers.cljs
+++ b/frontend/src/app/main/data/workspace/libraries_helpers.cljs
@@ -476,14 +476,16 @@
         root-inst     shape-inst
         root-master   (cp/get-component-root component)]
 
-    (generate-sync-shape-direct-recursive container
-                                          shape-inst
-                                          component
-                                          shape-master
-                                          root-inst
-                                          root-master
-                                          reset?
-                                          initial-root?)))
+    (if component
+      (generate-sync-shape-direct-recursive container
+                                            shape-inst
+                                            component
+                                            shape-master
+                                            root-inst
+                                            root-master
+                                            reset?
+                                            initial-root?)
+      empty-changes)))
 
 (defn- generate-sync-shape-direct-recursive
   [container shape-inst component shape-master root-inst root-master reset? initial-root?]
@@ -591,13 +593,15 @@
         root-inst     shape-inst
         root-master   (cp/get-component-root component)]
 
-    (generate-sync-shape-inverse-recursive container
-                                           shape-inst
-                                           component
-                                           shape-master
-                                           root-inst
-                                           root-master
-                                           initial-root?)))
+    (if component
+      (generate-sync-shape-inverse-recursive container
+                                             shape-inst
+                                             component
+                                             shape-master
+                                             root-inst
+                                             root-master
+                                             initial-root?)
+      empty-changes)))
 
 (defn- generate-sync-shape-inverse-recursive
   [container shape-inst component shape-master root-inst root-master initial-root?]