diff --git a/base_tier_validation/models/tier_definition.py b/base_tier_validation/models/tier_definition.py
index 007c630051..1fd6c18802 100644
--- a/base_tier_validation/models/tier_definition.py
+++ b/base_tier_validation/models/tier_definition.py
@@ -7,6 +7,7 @@
 class TierDefinition(models.Model):
     _name = "tier.definition"
     _description = "Tier Definition"
+    _check_company_auto = True
 
     @api.model
     def _get_default_name(self):
@@ -42,9 +43,6 @@ def _get_tier_validation_model_names(self):
         comodel_name="res.users",
         string="Reviewer",
         check_company=True,
-        readonly=False,
-        store=True,
-        compute="_compute_company_id_change",
     )
     reviewer_group_id = fields.Many2one(
         comodel_name="res.groups", string="Reviewer group"
@@ -89,11 +87,6 @@ def onchange_review_type(self):
         self.reviewer_id = None
         self.reviewer_group_id = None
 
-    @api.depends("company_id")
-    def _compute_company_id_change(self):
-        if self.company_id not in self.reviewer_id.company_ids:
-            self.reviewer_id = None
-
     @api.depends("review_type", "model_id")
     def _compute_domain_reviewer_field(self):
         for rec in self: