diff --git a/addons/hr_holidays/models/hr_employee.py b/addons/hr_holidays/models/hr_employee.py
index d869c42ce36..39a2a3e704e 100644
--- a/addons/hr_holidays/models/hr_employee.py
+++ b/addons/hr_holidays/models/hr_employee.py
@@ -154,7 +154,10 @@ class HrEmployeeBase(models.AbstractModel):
     def write(self, values):
         if 'parent_id' in values:
             manager = self.env['hr.employee'].browse(values['parent_id']).user_id
-            values['leave_manager_id'] = values.get('leave_manager_id', manager.id)
+            if manager:
+                to_change = self.filtered(lambda e: e.leave_manager_id == e.parent_id.user_id or not e.leave_manager_id)
+                to_change.write({'leave_manager_id': values.get('leave_manager_id', manager.id)})
+
         res = super(HrEmployeeBase, self).write(values)
         if 'parent_id' in values or 'department_id' in values:
             today_date = fields.Datetime.now()