diff --git a/addons/theme_default/__manifest__.py b/addons/theme_default/__manifest__.py
index cc864e7fea6..df5fc3e5a74 100644
--- a/addons/theme_default/__manifest__.py
+++ b/addons/theme_default/__manifest__.py
@@ -8,6 +8,9 @@
     'sequence': 1000,
     'version': '1.0',
     'depends': ['website'],
+    'data': [
+        'data/generate_primary_template.xml',
+    ],
     'images': [
         'static/description/cover.png',
         'static/description/theme_default_screenshot.jpg',
diff --git a/addons/theme_default/data/generate_primary_template.xml b/addons/theme_default/data/generate_primary_template.xml
new file mode 100644
index 00000000000..c4e0dd328ad
--- /dev/null
+++ b/addons/theme_default/data/generate_primary_template.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- Generate primary snippet templates that are not predefined -->
+<function model="ir.module.module" name="_generate_primary_snippet_templates">
+    <value eval="[ref('base.module_theme_default')]"/>
+</function>
+
+</odoo>
diff --git a/addons/website/models/ir_module_module.py b/addons/website/models/ir_module_module.py
index 71bec4c325a..56eea99a3aa 100644
--- a/addons/website/models/ir_module_module.py
+++ b/addons/website/models/ir_module_module.py
@@ -442,8 +442,7 @@ class IrModuleModule(models.Model):
         ], order='name')
 
         for theme in themes:
-            # TODO In master, only generate templates for installed themes.
-            # if theme.state != 'uninstalled':
+            # TODO In master, remove this call.
             theme._generate_primary_snippet_templates()
             terp = self.get_module_info(theme.name)
             images = terp.get('images', [])