diff --git a/addons/hr_timesheet/data/hr_timesheet_demo.xml b/addons/hr_timesheet/data/hr_timesheet_demo.xml
index a695b60b495..38d737381e6 100644
--- a/addons/hr_timesheet/data/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/data/hr_timesheet_demo.xml
@@ -17,26 +17,12 @@
     </record>
 
     <!-- Projects -->
-    <record id="account_analytic_account_project_1" model="account.analytic.account">
-        <field name="name">Office Design</field>
-        <field name="code">OD</field>
-        <field name="active" eval="True"/>
-    </record>
-
     <record id="project.project_project_1" model="project.project">
         <field name="allow_timesheets" eval="True"/>
-        <field name="analytic_account_id" ref="account_analytic_account_project_1"/>
-    </record>
-
-    <record id="account_analytic_account_project_2" model="account.analytic.account">
-        <field name="name">Research &amp; Development Project</field>
-        <field name="code">RD</field>
-        <field name="active" eval="True"/>
     </record>
 
     <record id="project.project_project_2" model="project.project">
         <field name="allow_timesheets" eval="True"/>
-        <field name="analytic_account_id" ref="account_analytic_account_project_2"/>
     </record>
 
     <!-- Timesheet Lines -->
diff --git a/addons/hr_timesheet/models/res_config_settings.py b/addons/hr_timesheet/models/res_config_settings.py
index 68ed5bd2df1..51f2fe5eb8a 100644
--- a/addons/hr_timesheet/models/res_config_settings.py
+++ b/addons/hr_timesheet/models/res_config_settings.py
@@ -7,8 +7,10 @@ from odoo import api, fields, models
 class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
-    module_project_timesheet_synchro = fields.Boolean("Awesome Timesheet")
-    module_project_timesheet_holidays = fields.Boolean("Record Time Off")
+    module_project_timesheet_synchro = fields.Boolean("Awesome Timesheet",
+        compute="_compute_timesheet_modules", store=True, readonly=False)
+    module_project_timesheet_holidays = fields.Boolean("Record Time Off",
+        compute="_compute_timesheet_modules", store=True, readonly=False)
     project_time_mode_id = fields.Many2one(
         'uom.uom', related='company_id.project_time_mode_id', string='Project Time Unit', readonly=False,
         help="This will set the unit of measure used in projects and tasks.\n"
@@ -27,3 +29,10 @@ class ResConfigSettings(models.TransientModel):
         product_uom_day = self.env.ref('uom.product_uom_day')
         for settings in self:
             settings.is_encode_uom_days = settings.timesheet_encode_uom_id == product_uom_day
+
+    @api.depends('module_hr_timesheet')
+    def _compute_timesheet_modules(self):
+        self.filtered(lambda config: not config.module_hr_timesheet).update({
+            'module_project_timesheet_synchro': False,
+            'module_project_timesheet_holidays': False,
+        })