diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 435ccd3339e..7c3755d2cc3 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -1248,6 +1248,7 @@ class Website(models.Model):
         if domain is None:
             domain = []
         domain += self.get_current_website().website_domain()
+        domain = AND([domain, [('url', '!=', False)]])
         pages = self.env['website.page'].sudo().search(domain, order=order, limit=limit)
         pages = pages._get_most_specific_pages()
         return pages
diff --git a/addons/website/models/website_page.py b/addons/website/models/website_page.py
index 71c2344a48a..c749b7179f6 100644
--- a/addons/website/models/website_page.py
+++ b/addons/website/models/website_page.py
@@ -96,7 +96,7 @@ class Page(models.Model):
         ids = []
         previous_page = None
         # Iterate a single time on the whole list sorted on specific-website first.
-        for page in self.sorted(key=lambda p: (p.url, not p.website_id)):
+        for page in self.sorted(key=lambda p: (p.url or '', not p.website_id)):
             if not previous_page or page.url != previous_page.url:
                 ids.append(page.id)
             previous_page = page