diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 433fc5e297a..c737f064e1a 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -105,11 +105,12 @@ class Http(models.AbstractModel):
         req_page = request.httprequest.path
 
         domain = [('url', '=', req_page), '|', ('website_ids', 'in', request.website.id), ('website_ids', '=', False)]
+        pages = request.env['website.page'].search(domain)
 
-        if not request.website.is_publisher:
-            domain += [('is_visible', '=', True)]
+        if not request.website.is_publisher():
+            pages = pages.filtered('is_visible')
 
-        mypage = request.env['website.page'].search(domain, limit=1)
+        mypage = pages[0] if pages else False
         _, ext = os.path.splitext(req_page)
         if mypage:
             return request.render(mypage.view_id.id, {