diff --git a/common/src/app/common/logic/libraries.cljc b/common/src/app/common/logic/libraries.cljc
index 05dac8ca49..6ad899f0e2 100644
--- a/common/src/app/common/logic/libraries.cljc
+++ b/common/src/app/common/logic/libraries.cljc
@@ -442,13 +442,13 @@
      (prepare-restore-component changes library-data component-id page nil nil nil nil)))
 
   ([changes library-data component-id page position old-id parent-id frame-id]
-   (let [library-data      (or (when (pcb/has-library-data? changes)
-                                 (pcb/get-library-data changes))
-                               library-data)
+   (let [library-data      (if (pcb/has-library-data? changes)
+                             (pcb/get-library-data changes)
+                             library-data)
          component         (ctkl/get-deleted-component library-data component-id)
-         objects           (or (when (pcb/has-objects? changes)
-                                 (pcb/get-objects changes))
-                               (:objects page))
+         objects           (if (pcb/has-objects? changes)
+                             (pcb/get-objects changes)
+                             (:objects page))
          parent            (get objects parent-id)
          main-inst         (get-in component [:objects (:main-instance-id component)])
          inside-component? (some? (ctn/get-instance-root (:objects page) parent))
diff --git a/common/src/app/common/logic/shapes.cljc b/common/src/app/common/logic/shapes.cljc
index 37fb791046..0a364a4342 100644
--- a/common/src/app/common/logic/shapes.cljc
+++ b/common/src/app/common/logic/shapes.cljc
@@ -269,9 +269,9 @@
    (let [objects (pcb/get-objects changes)
          data    (pcb/get-library-data changes)
          page-id (pcb/get-page-id changes)
-         page    (or (when (pcb/has-page? changes)
-                       (pcb/get-page changes))
-                     (ctpl/get-page data page-id))
+         page    (if (pcb/has-page? changes)
+                   (pcb/get-page changes)
+                   (ctpl/get-page data page-id))
          ids     (cfh/clean-loops objects ids)
 
          in-component-copy?