diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index a5073d791f3..d886bfd2683 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -220,7 +220,8 @@ class HrEmployeePrivate(models.Model):
 
     @api.onchange('department_id')
     def _onchange_department(self):
-        self.parent_id = self.department_id.manager_id
+        if self.department_id.manager_id:
+            self.parent_id = self.department_id.manager_id
 
     @api.onchange('user_id')
     def _onchange_user(self):
diff --git a/addons/hr/views/hr_department_views.xml b/addons/hr/views/hr_department_views.xml
index f2897bc3ef4..c2ab9d8dcef 100644
--- a/addons/hr/views/hr_department_views.xml
+++ b/addons/hr/views/hr_department_views.xml
@@ -8,8 +8,8 @@
                 <form string="department">
                     <sheet>
                         <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <field name="active" invisible="1"/>
                         <group col="4">
-                            <field name="active" invisible="1"/>
                             <field name="name"/>
                             <field name="manager_id"/>
                             <field name="parent_id"/>