diff --git a/models/res_partner.py b/models/res_partner.py
index 9a7a812dcc2e409f90661acbd1e75ef354743572..47fcdfdf4e1dc121cd714ef633c8d57f45e901fc 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -1057,21 +1057,24 @@ class ScopPartner(models.Model):
             else:
                 partner.formatted_siret = None
 
-    @api.depends("zip", "state_id")
+    @api.depends("zip")
     def _compute_num_departement(self):
         for company in self:
             if company.zip:
-                if company.state_id:
-                    try:
-                        domtom = self.env.ref("cgscop_partner.domtom")
-                        if company.state_id == domtom:
-                            company.zip_departement = company.zip[:3]
-                        else:
-                            company.zip_departement = company.zip[:2]
-                    except Exception:
-                        company.zip_departement = company.zip[:2]
+                zip_starts = company.zip[:3]
+                if zip_starts in ["200", "201"]:
+                    zip_departement = "2A"
+                elif zip_starts == "202":
+                    zip_departement = "2B"
+                elif zip_starts[:2] == "97":
+                    zip_departement = zip_starts
+                else:
+                    zip_departement = zip_starts[:2]
+
+                if zip_departement in ["2A", "2B"] or int(zip_departement):
+                    company.zip_departement = zip_departement
                 else:
-                    company.zip_departement = company.zip[:2]
+                    company.zip_departement = False
 
     @api.depends("zip")
     def _compute_region(self):
diff --git a/models/scop_revision.py b/models/scop_revision.py
index b47a1d568c5c9264ba39b4a96a72c00d619bf95c..afa074a804b1fecbec29a6acc4952d7fb35b4637 100644
--- a/models/scop_revision.py
+++ b/models/scop_revision.py
@@ -25,7 +25,6 @@ class ScopRevision(models.Model):
         comodel_name="res.users",
         string="Réviseur agréé",
         ondelete="restrict",
-        tracking=True,
     )
     revision_result_year = fields.Integer("Exercice révisé")
     revision_staff = fields.Integer("Effectif")