diff --git a/material/partials/header.html b/material/partials/header.html
index bb0f4ecc7..0a3144fd0 100644
--- a/material/partials/header.html
+++ b/material/partials/header.html
@@ -1,13 +1,9 @@
 {#-
   This file was automatically generated - do not edit
 -#}
-{% set site_url = config.site_url | d(nav.homepage.url, true) | url %}
-{% if not config.use_directory_urls and site_url[0] == site_url[-1] == "." %}
-  {% set site_url = site_url ~ "/index.html" %}
-{% endif %}
 <header class="md-header" data-md-component="header">
   <nav class="md-header__inner md-grid" aria-label="{{ lang.t('header.title') }}">
-    <a href="{{ site_url }}" title="{{ config.site_name | e }}" class="md-header__button md-logo" aria-label="{{ config.site_name }}">
+    <a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}" title="{{ config.site_name | e }}" class="md-header__button md-logo" aria-label="{{ config.site_name }}">
       {% include "partials/logo.html" %}
     </a>
     <label class="md-header__button md-icon" for="__drawer">
diff --git a/material/partials/nav.html b/material/partials/nav.html
index 4edabb17b..575005908 100644
--- a/material/partials/nav.html
+++ b/material/partials/nav.html
@@ -1,10 +1,6 @@
 {#-
   This file was automatically generated - do not edit
 -#}
-{% set site_url = config.site_url | d(nav.homepage.url, true) | url %}
-{% if not config.use_directory_urls and site_url[0] == site_url[-1] == "." %}
-  {% set site_url = site_url ~ "/index.html" %}
-{% endif %}
 {% set class = "md-nav md-nav--primary" %}
 {% if "navigation.tabs" in features %}
   {% set class = class ~ " md-nav--lifted" %}
@@ -14,7 +10,7 @@
 {% endif %}
 <nav class="{{ class }}" aria-label="{{ lang.t('nav.title') }}" data-md-level="0">
   <label class="md-nav__title" for="__drawer">
-    <a href="{{ site_url }}" title="{{ config.site_name | e }}" class="md-nav__button md-logo" aria-label="{{ config.site_name }}">
+    <a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}" title="{{ config.site_name | e }}" class="md-nav__button md-logo" aria-label="{{ config.site_name }}">
       {% include "partials/logo.html" %}
     </a>
     {{ config.site_name }}
diff --git a/src/partials/header.html b/src/partials/header.html
index 4ce5b1222..09d74ade3 100644
--- a/src/partials/header.html
+++ b/src/partials/header.html
@@ -20,12 +20,6 @@
   IN THE SOFTWARE.
 -->
 
-<!-- Mitigate bug: https://github.com/mkdocs/mkdocs/issues/2191 -->
-{% set site_url = config.site_url | d(nav.homepage.url, true) | url %}
-{% if not config.use_directory_urls and site_url[0] == site_url[-1] == "." %}
-  {% set site_url = site_url ~ "/index.html" %}
-{% endif %}
-
 <!-- Header -->
 <header class="md-header" data-md-component="header">
   <nav
@@ -35,7 +29,7 @@
 
     <!-- Link to home -->
     <a
-      href="{{ site_url }}"
+      href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}"
       title="{{ config.site_name | e }}"
       class="md-header__button md-logo"
       aria-label="{{ config.site_name }}"
diff --git a/src/partials/nav.html b/src/partials/nav.html
index 91ff7485f..6d01ea09f 100644
--- a/src/partials/nav.html
+++ b/src/partials/nav.html
@@ -20,12 +20,6 @@
   IN THE SOFTWARE.
 -->
 
-<!-- Mitigate bug: https://github.com/mkdocs/mkdocs/issues/2191 -->
-{% set site_url = config.site_url | d(nav.homepage.url, true) | url %}
-{% if not config.use_directory_urls and site_url[0] == site_url[-1] == "." %}
-  {% set site_url = site_url ~ "/index.html" %}
-{% endif %}
-
 <!-- Determine class according to configuration -->
 {% set class = "md-nav md-nav--primary" %}
 {% if "navigation.tabs" in features %}
@@ -45,7 +39,7 @@
   <!-- Site title -->
   <label class="md-nav__title" for="__drawer">
     <a
-      href="{{ site_url }}"
+      href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}"
       title="{{ config.site_name | e }}"
       class="md-nav__button md-logo"
       aria-label="{{ config.site_name }}"