diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 3ef137329..dbda6879e 100755
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ $.Site.LanguageCode | default "en" }}" {{ partial "language-direction.html" . | safeHTMLAttr }}>
+<html lang="{{ site.LanguageCode | default "en" }}" {{- with partialCached "func/GetLanguageDirection" "GetLanguageDirection" }} dir="{{ . }}" {{- end }}>
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
diff --git a/layouts/partials/func/GetLanguageDirection.html b/layouts/partials/func/GetLanguageDirection.html
new file mode 100644
index 000000000..e42a42384
--- /dev/null
+++ b/layouts/partials/func/GetLanguageDirection.html
@@ -0,0 +1,7 @@
+{{ $dir := "" }}
+{{ if ge hugo.Version "0.67.1" }}
+  {{ with  site.Language.LanguageDirection }}
+     {{ $dir = . }}
+  {{ end }}
+{{ end }}
+{{ return $dir }}
diff --git a/layouts/partials/language-direction.html b/layouts/partials/language-direction.html
deleted file mode 100644
index 31fa90c3c..000000000
--- a/layouts/partials/language-direction.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{- if ge hugo.Version "0.67.1" -}}
-   dir="{{ $.Site.Language.LanguageDirection | default "ltr" }}"
-{{- end -}}
