diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc
index 83f57a8f6a..e719452d8d 100644
--- a/common/src/app/common/files/migrations.cljc
+++ b/common/src/app/common/files/migrations.cljc
@@ -29,6 +29,7 @@
    [app.common.types.path :as path]
    [app.common.types.path.segment :as path.segment]
    [app.common.types.shape :as cts]
+   [app.common.types.shape-tree :as ctsht]
    [app.common.types.shape.interactions :as ctsi]
    [app.common.types.shape.shadow :as ctss]
    [app.common.types.shape.text :as ctst]
@@ -1838,6 +1839,56 @@
               component))]
     (d/update-when data :components check-component)))
 
+(defmethod migrate-data "0020-fix-missing-swap-slots"
+  [data _]
+  (let [file      {:id (:id data) :data data}
+        libraries (when (:libs data)
+                    (deref (:libs data)))]
+
+    (letfn [(update-shape-recursive
+              [container shape-id root?]
+              #_(when root?
+                  (prn "Checking container:" (:id container)))
+              (if (:objects container)
+                (let [shape (ctsht/get-shape container shape-id)]
+                  (if (and (ctk/instance-head? shape) (ctk/in-component-copy? shape))
+                    (let [ref-shape (ctf/find-ref-shape file container libraries shape :include-deleted? true :with-context? true)
+                          container (:container (meta ref-shape))]
+                      (if (some? ref-shape)
+                        (compare-slots container container shape ref-shape)
+                        container))
+                    (reduce (fn [container child-id]
+                              (update-shape-recursive container child-id false))
+                            container
+                            (:shapes shape))))
+              container))
+
+            (compare-slots
+              [container-copy container-main shape-copy shape-main]
+              (prn "comparing shape:" (:id shape-copy) " with ref:" (:id shape-main))
+              (if (and (not= (:shape-ref shape-copy) (:id shape-main))
+                       (nil? (ctk/get-swap-slot shape-copy)))
+                (let [new-slot (or (ctk/get-swap-slot shape-main) (:id shape-main))]
+                  (prn "Fixing swap slot for shape:" (:id shape-copy) " to " new-slot)
+                  container-copy)
+                (if (nil? (ctk/get-swap-slot shape-copy))
+                  (let [children-id-pairs (d/zip-all (:shapes shape-copy) (:shapes shape-main))]
+                    (reduce (fn [container [child-copy-id child-main-id]]
+                              (let [child-copy (ctsht/get-shape container-copy child-copy-id)
+                                    child-main (ctsht/get-shape container-main child-main-id)]
+                                (if (and (some? child-copy) (some? child-main))
+                                  (compare-slots container container-main child-copy child-main)
+                                  container-copy)))
+                            container-copy
+                            children-id-pairs))
+                  container-copy)))]
+
+      (prn "start migration" (:id data))
+      (-> data
+          (update :pages-index d/update-vals #(update-shape-recursive % uuid/zero true))
+          (d/update-when :components d/update-vals #(update-shape-recursive % (:main-instance-id %) true))
+          (d/tap-r (fn [_] (prn "end migration")))))))
+
 (def available-migrations
   (into (d/ordered-set)
         ["legacy-2"
@@ -1913,5 +1964,6 @@
          "0015-clean-shadow-color"
          "0016-copy-fills-from-position-data-to-text-node"
          "0017-fix-layout-flex-dir"
-         "0018-sync-component-id-with-near-main"]))
+         "0018-sync-component-id-with-near-main"
          "0019-remove-unneeded-objects-from-components"
+         "0020-fix-missing-swap-slots"]))
diff --git a/common/src/app/common/files/validate.cljc b/common/src/app/common/files/validate.cljc
index 59f1f5fad0..a3a423fded 100644
--- a/common/src/app/common/files/validate.cljc
+++ b/common/src/app/common/files/validate.cljc
@@ -767,7 +767,7 @@
 (defn- check-swap-slots
   [shape-id file page libraries]
   (let [shape (ctst/get-shape page shape-id)]
-    (if (and (ctk/instance-root? shape) (ctk/in-component-copy? shape))
+    (if (and (ctk/instance-head? shape) (ctk/in-component-copy? shape))
       (let [ref-shape (ctf/find-ref-shape file page libraries shape :include-deleted? true :with-context? true)
             container (:container (meta ref-shape))]
         (when (some? ref-shape)