diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 76d2146..e800ddd 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="nojs" lang="{{ .Site.LanguageCode }}" dir="{{ .Site.Language.LanguageDirection | default "ltr" }}">
+<html class="nojs" lang="{{ .Site.LanguageCode | default .Site.Language.Lang }}" dir="{{ .Site.Language.LanguageDirection | default "ltr" }}">
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width">
diff --git a/layouts/partials/language-selector.html b/layouts/partials/language-selector.html
index 8d82c4b..d4945c3 100644
--- a/layouts/partials/language-selector.html
+++ b/layouts/partials/language-selector.html
@@ -6,12 +6,12 @@
 <ul class="navbar">
 {{ if .IsTranslated -}}
 {{ range .Translations }}
-<li><a rel="alternate" href="{{ .RelPermalink }}" hreflang="{{ .Lang }}" lang="{{ .Lang }}">{{ .Language.LanguageName }}</a></li>
+<li><a rel="alternate" href="{{ .RelPermalink }}" hreflang="{{ .Language.Params.LanguageCode | default .Lang }}" lang="{{ .Language.Params.LanguageCode | default .Lang }}">{{ .Language.LanguageName }}</a></li>
 {{ end -}}
 {{ else -}}
 {{ range .Site.Languages -}}
 {{ if ne $.Site.Language.Lang .Lang }}
-<li><a rel="alternate" href="{{ .Lang | relURL }}" hreflang="{{ .Lang }}" lang="{{ .Lang }}">{{ .LanguageName }}</a></li>
+<li><a rel="alternate" href="{{ .Lang | relURL }}" hreflang="{{ .Params.LanguageCode | default .Lang }}" lang="{{ .Params.LanguageCode | default .Lang }}">{{ .LanguageName }}</a></li>
 {{ end -}}
 {{ end -}}
 {{ end -}}
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 8c2866b..293e2f3 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -19,7 +19,7 @@
 <link rel="canonical" href="{{ .Permalink }}">
 {{ if .IsTranslated -}}
 {{ range .Translations }}
-<link rel="alternate" hreflang="{{ .Lang }}" href="{{ .RelPermalink }}">
+<link rel="alternate" hreflang="{{ .Language.Params.LanguageCode | default .Lang }}" href="{{ .RelPermalink }}">
 {{ end -}}
 {{ end -}}
 <link rel="apple-touch-icon" href="{{ "apple-touch-icon.png" | relURL }}">