diff --git a/addons/website/models/ir_module_module.py b/addons/website/models/ir_module_module.py
index d8609620dac8d29f5223055ac78d1a375a06f071..1e8ec1fe5e9a544d5d8728409345ae6adcae7ef9 100644
--- a/addons/website/models/ir_module_module.py
+++ b/addons/website/models/ir_module_module.py
@@ -202,7 +202,7 @@ class IrModuleModule(models.Model):
             for model_name in self._theme_model_names:
                 module._update_records(model_name, website)
 
-            self.env['theme.utils']._post_copy(module, website)
+            self.env['theme.utils'].with_context(website_id=website.id)._post_copy(module)
 
     def _theme_unload(self, website):
         """
diff --git a/addons/website/models/theme_models.py b/addons/website/models/theme_models.py
index 71fc63d5256af513a58ae74e5708ab7deb8be0f7..e779a1eb5cd6f6e99b78b0cff5ae26c7c25619bc 100644
--- a/addons/website/models/theme_models.py
+++ b/addons/website/models/theme_models.py
@@ -152,11 +152,7 @@ class Theme(models.AbstractModel):
     _description = 'Theme Utils'
     _auto = False
 
-    def _post_copy(self, mod, website=False):
-        # deprecated: to remove in master
-        if not website:  # remove optional website in master
-            website = self.env['website'].get_current_website()
-
+    def _post_copy(self, mod):
         # Reinitialize font customizations
         self.env['web_editor.assets'].make_scss_customization(
             '/website/static/src/scss/options/user_values.scss',
@@ -172,7 +168,7 @@ class Theme(models.AbstractModel):
         theme_post_copy = '_%s_post_copy' % mod.name
         if hasattr(self, theme_post_copy):
             _logger.info('Executing method %s' % theme_post_copy)
-            method = getattr(self.with_context(website_id=website.id), theme_post_copy)
+            method = getattr(self, theme_post_copy)
             return method(mod)
         return False