diff --git a/l10n_mx_facturae/migrations/3.1.0/post-migration.py b/l10n_mx_facturae/migrations/3.1.0/post-migration.py
index c19574731daf9e37393ad1a1c1484e02d664cfd5..45ea7186bd16c4b12df6d3ce95962dcfe23dc88a 100644
--- a/l10n_mx_facturae/migrations/3.1.0/post-migration.py
+++ b/l10n_mx_facturae/migrations/3.1.0/post-migration.py
@@ -16,6 +16,13 @@ def migrate_res_partner(env):
             "cfdi_adenda_ids",
             legacy_name,
         )
+        # Clear helper fields used for migrate data
+        tools.drop_columns(
+            env.cr,
+            [
+                ("res_partner", tools.get_legacy_name("cfdi_adenda")),
+            ],
+        )
 
 
 def migrate_account_invoice(env):
@@ -29,17 +36,16 @@ def migrate_account_invoice(env):
             "cfdi_adenda_ids",
             legacy_name,
         )
+        # Clear helper fields used for migrate data
+        tools.drop_columns(
+            env.cr,
+            [
+                ("account_invoice", tools.get_legacy_name("cfdi_adenda_id")),
+            ],
+        )
 
 
 @tools.migrate(use_env=True, uid=SUPERUSER_ID)
 def migrate(env, installed_version):
     migrate_res_partner(env)
     migrate_account_invoice(env)
-    # Clear helper fields used for migrate data
-    tools.drop_columns(
-        env.cr,
-        [
-            ("res_partner", tools.get_legacy_name("cfdi_adenda")),
-            ("account_invoice", tools.get_legacy_name("cfdi_adenda_id")),
-        ],
-    )
diff --git a/l10n_mx_facturae/migrations/3.1.0/pre-migration.py b/l10n_mx_facturae/migrations/3.1.0/pre-migration.py
index cbe82d84ef2ff980ffcd03abe889e7b9e7dab53c..1554366a8901b5a36aa76b81ac8482ff4628a8a5 100644
--- a/l10n_mx_facturae/migrations/3.1.0/pre-migration.py
+++ b/l10n_mx_facturae/migrations/3.1.0/pre-migration.py
@@ -13,5 +13,5 @@ column_renames = {
 
 @tools.migrate(use_env=True, uid=SUPERUSER_ID)
 def migrate(env, installed_version):
-    if column_renames:
+    if tools.column_exists(env.cr, "res_partner", "cfdi_adenda_id"):
         tools.rename_columns(env.cr, column_renames)