diff --git a/layouts/alias.html b/layouts/alias.html
index 61210feb92..e63cc4bdea 100644
--- a/layouts/alias.html
+++ b/layouts/alias.html
@@ -2,7 +2,19 @@
{{- $url := replace (replace .Permalink site.BaseURL "/") "//" "/" }}
- {{- $url = partial "relLangPrettyUglyURL.hugo" (dict "link" $url) }}
+ {{- with site.Home.GetPage $url }}
+ {{- $c := "" }}{{/* if defaultContentLanguageInSubdir=false we are ending here for home page of the default language */}}
+ {{- $url = partial "relLangPrettyUglyURL.hugo" (dict "to" .) }}
+ {{- else }}
+ {{- $url_alt := replaceRE "^/[^/]*(/.*)" "${1}" $url }}
+ {{- with site.Home.GetPage $url_alt }}
+ {{- $c := "" }}{{/* if defaultContentLanguageInSubdir=true we are ending here for home page */}}
+ {{- $url = partial "relLangPrettyUglyURL.hugo" (dict "to" .) }}
+ {{- else }}
+ {{- $c := "" }}{{/* for regular aliases we are ending here with no original page found */}}
+ {{- $url = partial "relLangPrettyUglyURL.hugo" (dict "link" $url) }}
+ {{- end }}
+ {{- end }}