diff --git a/admin/migration/v18Plafonds.php b/admin/migration/v18Plafonds.php
index 256538697708a3d0271730333c3b999af1390f63..b01cf176191f7085b6ad3b61118b8afdee0e2cc4 100644
--- a/admin/migration/v18Plafonds.php
+++ b/admin/migration/v18Plafonds.php
@@ -19,7 +19,7 @@ class v18Plafonds extends AbstractMigration
 
     public function utile(): bool
     {
-        return $this->manager->hasNew('table', 'PLAFOND_PERIMETRE');
+        return $this->manager->hasNew('table', 'PLAFOND_PERIMETRE') || $this->manager->hasTable('SAVE_V18_PLAFOND');
     }
 
 
@@ -71,7 +71,7 @@ class v18Plafonds extends AbstractMigration
         }
 
         if (!empty($bdd->table()->get('PLAFOND'))) {
-            $bdd->exec('DROP TABLE PLAFOND');
+            $bdd->exec('DROP TABLE PLAFOND CASCADE CONSTRAINTS');
             $c->msg('Suppression des anciens plafonds');
         }
     }
diff --git a/admin/migration/v18Statuts.php b/admin/migration/v18Statuts.php
index 14850e62a6e010bec2151a746eadae99d17e2cf9..4f51fc7e815cf610a849702a22f37105407780c1 100644
--- a/admin/migration/v18Statuts.php
+++ b/admin/migration/v18Statuts.php
@@ -78,8 +78,7 @@ class v18Statuts extends AbstractMigration
 
         $ddl = $bdd->table()->get('TBL_WORKFLOW')['TBL_WORKFLOW'];
         if (!isset($ddl['columns']['STATUT_ID'])) {
-            $bdd->exec('DROP TABLE WF_DEP_BLOQUANTE');
-            $bdd->exec('DROP TABLE TBL_WORKFLOW');
+            $bdd->exec('DROP TABLE TBL_WORKFLOW CASCADE CONSTRAINTS');
             $c->msg('Suppression de la table TBL_WORKFLOW, qui sera recréée au nouveau format');
         }