diff --git a/addons/website/models/ir_module_module.py b/addons/website/models/ir_module_module.py
index 74fa2e93b67..2aee69b2f7c 100644
--- a/addons/website/models/ir_module_module.py
+++ b/addons/website/models/ir_module_module.py
@@ -442,6 +442,8 @@ class IrModuleModule(models.Model):
         ], order='name')
 
         for theme in themes:
+            # TODO In master, only generate templates for installed themes.
+            # if theme.state != 'uninstalled':
             theme._generate_primary_snippet_templates()
             terp = self.get_module_info(theme.name)
             images = terp.get('images', [])
@@ -675,6 +677,9 @@ class IrModuleModule(models.Model):
         # Generate configurator snippet templates for specific pages
         create_values = []
         for page_name in configurator_snippets:
+            # TODO Remove in master.
+            if page_name == '_':
+                continue
             for snippet_name in configurator_snippets[page_name]:
                 create_values.append(get_create_vals(
                     f"Snippet {snippet_name!r} for {page_name!r} pages generated by the configurator",