diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc
index 564fe4fc55..94949fbc1e 100644
--- a/common/src/app/common/files/migrations.cljc
+++ b/common/src/app/common/files/migrations.cljc
@@ -1277,22 +1277,21 @@
         (update :pages-index d/update-vals update-container)
         (d/update-when :components d/update-vals update-container))))
 
-(defmethod migrate-data "0002-normalize-bool-content"
+(defmethod migrate-data "0002-normalize-bool-content-v2"
   [data _]
   (letfn [(update-object [object]
-            ;; NOTE: we still preserve the previous value for possible
-            ;; rollback, we still need to perform an other migration
-            ;; for properly delete the bool-content prop from shapes
-            ;; once the know the migration was OK
-            (if (and (cfh/bool-shape? object)
-                     (not (contains? object :content)))
-              (if-let [content (:bool-content object)]
-                (assoc object :content content)
-                object)
+            (if (cfh/bool-shape? object)
+              (if (contains? object :content)
+                (dissoc object :bool-content)
+                (let [content (:bool-content object)]
+                  (-> object
+                      (assoc :content content)
+                      (dissoc :bool-content))))
+
               (dissoc object :bool-content :bool-type)))
 
           (update-container [container]
-            (d/update-when container :objects update-vals update-object))]
+            (d/update-when container :objects d/update-vals update-object))]
 
     (-> data
         (update :pages-index d/update-vals update-container)
@@ -1331,7 +1330,7 @@
               object))
 
           (update-container [container]
-            (d/update-when container :objects update-vals update-object))]
+            (d/update-when container :objects d/update-vals update-object))]
 
     (-> data
         (update :pages-index d/update-vals update-container)
@@ -1556,7 +1555,7 @@
          "legacy-66"
          "legacy-67"
          "0001-remove-tokens-from-groups"
-         "0002-normalize-bool-content"
+         "0002-normalize-bool-content-v2"
          "0002-clean-shape-interactions"
          "0003-fix-root-shape"
          "0003-convert-path-content"