diff --git a/addons/repair/models/repair.py b/addons/repair/models/repair.py
index 432e1f02b0a..25443b46ce8 100644
--- a/addons/repair/models/repair.py
+++ b/addons/repair/models/repair.py
@@ -193,8 +193,9 @@ class Repair(models.Model):
     @api.onchange('company_id')
     def _onchange_company_id(self):
         if self.company_id:
-            warehouse = self.env['stock.warehouse'].search([('company_id', '=', self.company_id.id)], limit=1)
-            self.location_id = warehouse.lot_stock_id
+            if self.location_id.company_id != self.company_id:
+                warehouse = self.env['stock.warehouse'].search([('company_id', '=', self.company_id.id)], limit=1)
+                self.location_id = warehouse.lot_stock_id
         else:
             self.location_id = False