diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index b3ef9a42cdc..ebef7e81729 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -929,7 +929,7 @@ class Website(models.Model):
             arguments = dict(request.endpoint_arguments)
             for key, val in list(arguments.items()):
                 if isinstance(val, models.BaseModel):
-                    if val.env.context.get('lang') != lang.url_code:
+                    if val.env.context.get('lang') != lang.code:
                         arguments[key] = val.with_context(lang=lang.url_code)
             path = router.build(request.endpoint, arguments)
         else:
diff --git a/addons/website_blog/tests/test_performance.py b/addons/website_blog/tests/test_performance.py
index 2763cfaffa5..30c77220bb0 100644
--- a/addons/website_blog/tests/test_performance.py
+++ b/addons/website_blog/tests/test_performance.py
@@ -20,7 +20,7 @@ class TestBlogPerformance(UtilPerf):
             blog_post.tag_ids += blog_tags
             blog_tags = blog_tags[:-1]
         self.assertEqual(self._get_url_hot_query('/blog'), 26)
-        self.assertEqual(self._get_url_hot_query(blog_post[0].website_url), 31)
+        self.assertEqual(self._get_url_hot_query(blog_post[0].website_url), 29)
 
     def test_30_perf_sql_blog_bigger_data_scaling(self):
         BlogPost = self.env['blog.post']
@@ -33,4 +33,4 @@ class TestBlogPerformance(UtilPerf):
             blog_post.write({'tag_ids': [[6, 0, random.choices(blog_tags.ids, k=random.randint(0, len(blog_tags)))]]})
 
         self.assertEqual(self._get_url_hot_query('/blog'), 26)
-        self.assertEqual(self._get_url_hot_query(blog_post[0].website_url), 31)
+        self.assertEqual(self._get_url_hot_query(blog_post[0].website_url), 29)