diff --git a/backend/src/app/features/components_v2.clj b/backend/src/app/features/components_v2.clj
index 548255a5a4..4b388f3058 100644
--- a/backend/src/app/features/components_v2.clj
+++ b/backend/src/app/features/components_v2.clj
@@ -667,23 +667,7 @@
                               :component-root)))]
             (-> file-data
                 (update :pages-index update-vals fix-container)
-                (d/update-when :components update-vals fix-container))))
-
-        fix-shape-nil-parent-id
-        (fn [file-data]
-          ;; Ensure that parent-id and frame-id are not nil
-          (letfn [(fix-container [container]
-                    (d/update-when container :objects update-vals fix-shape))
-
-                  (fix-shape [shape]
-                    (let [frame-id  (or (:frame-id shape)
-                                        uuid/zero)
-                          parent-id (or (:parent-id shape)
-                                        frame-id)]
-                      (assoc shape :frame-id frame-id
-                             :parent-id parent-id)))]
-            (-> file-data
-                (update :pages-index update-vals fix-container))))]
+                (d/update-when :components update-vals fix-container))))]
 
     (-> file-data
         (fix-file-data)
@@ -708,7 +692,6 @@
         (fix-frame-ids)
         (fix-component-nil-objects)
         (fix-false-copies)
-        (fix-shape-nil-parent-id)
         (fix-copies-of-detached))))  ; <- Do not add fixes after this one
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/common/src/app/common/files/defaults.cljc b/common/src/app/common/files/defaults.cljc
index e35914d73f..aae6cf1ef1 100644
--- a/common/src/app/common/files/defaults.cljc
+++ b/common/src/app/common/files/defaults.cljc
@@ -6,4 +6,4 @@
 
 (ns app.common.files.defaults)
 
-(def version 44)
+(def version 45)
diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc
index 025f1d8417..49e37e0b77 100644
--- a/common/src/app/common/files/migrations.cljc
+++ b/common/src/app/common/files/migrations.cljc
@@ -843,3 +843,18 @@
     (-> data
         (update :pages-index update-vals update-container)
         (update :components update-vals update-container))))
+
+(defmethod migrate 45
+  [data]
+  (letfn [(fix-shape [shape]
+            (let [frame-id  (or (:frame-id shape)
+                                uuid/zero)
+                  parent-id (or (:parent-id shape)
+                                frame-id)]
+              (assoc shape :frame-id frame-id
+                     :parent-id parent-id)))
+
+          (update-container [container]
+            (d/update-when container :objects update-vals fix-shape))]
+    (-> data
+        (update :pages-index update-vals update-container))))
\ No newline at end of file