diff --git a/addons/hr_timesheet/models/hr_timesheet.py b/addons/hr_timesheet/models/hr_timesheet.py
index 5ec54373833..9aca9f0f0f5 100644
--- a/addons/hr_timesheet/models/hr_timesheet.py
+++ b/addons/hr_timesheet/models/hr_timesheet.py
@@ -32,6 +32,11 @@ class AccountAnalyticLine(models.Model):
                 'task_id': [('project_id', '=', self.project_id.id)]
             }}
 
+    @api.onchange('task_id')
+    def _onchange_task_id(self):
+        if not self.project_id:
+            self.project_id = self.task_id.project_id
+
     @api.onchange('employee_id')
     def _onchange_employee_id(self):
         self.user_id = self.employee_id.user_id
diff --git a/addons/hr_timesheet/views/hr_timesheet_views.xml b/addons/hr_timesheet/views/hr_timesheet_views.xml
index caefdad4c90..ebdc5dd321a 100644
--- a/addons/hr_timesheet/views/hr_timesheet_views.xml
+++ b/addons/hr_timesheet/views/hr_timesheet_views.xml
@@ -43,7 +43,7 @@
                     <field name="date"/>
                     <field name="name"/>
                     <field name="project_id" required="1"/>
-                    <field name="task_id" context="{'default_project_id': project_id}" domain="[('project_id', '=', project_id)]"/>
+                    <field name="task_id" context="{'default_project_id': project_id}"/>
                     <field name="unit_amount" string="Time (Hours)" sum="Total time" widget="float_time"/>
                 </tree>
             </field>
@@ -88,7 +88,7 @@
                                 <field name="date"/>
                                 <field name="name"/>
                                 <field name="project_id" required="1"/>
-                                <field name="task_id" domain="[('project_id', '=', project_id)]"/>
+                                <field name="task_id"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>
                             <group>