diff --git a/addons/project_timesheet_holidays/__init__.py b/addons/project_timesheet_holidays/__init__.py
index e0650fcb3fa..decad8be0a0 100644
--- a/addons/project_timesheet_holidays/__init__.py
+++ b/addons/project_timesheet_holidays/__init__.py
@@ -9,9 +9,10 @@ def post_init(env):
         be sure the internal project/task of res.company are set. (Since timesheet_generate field
         is true by default, those 2 fields are required on the leave type).
     """
-    for hr_leave_type in env['hr.leave.type'].search([('timesheet_generate', '=', True), ('timesheet_project_id', '=', False)]):
-        company = hr_leave_type.company_id or env.company
+    for hr_leave_type in env['hr.leave.type'].search([('timesheet_generate', '=', True), ('company_id', '!=', False), ('timesheet_project_id', '=', False)]):
+        project_id = hr_leave_type.company_id.internal_project_id
+        default_task_id = hr_leave_type.company_id.leave_timesheet_task_id
         hr_leave_type.write({
-            'timesheet_project_id': company.internal_project_id.id,
-            'timesheet_task_id': company.leave_timesheet_task_id.id,
+            'timesheet_project_id': project_id.id,
+            'timesheet_task_id': default_task_id.id if default_task_id and default_task_id.project_id == project_id else False,
         })