diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 6de22c8f241..e99e0fd4e82 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -519,7 +519,12 @@ class Website(models.Model): @api.model def get_current_website(self, fallback=True): if request and request.session.get('force_website_id'): - return self.browse(request.session['force_website_id']) + website_id = self.browse(request.session['force_website_id']).exists() + if not website_id: + # Don't crash is session website got deleted + request.session.pop('force_website_id') + else: + return website_id website_id = self.env.context.get('website_id') if website_id: