diff --git a/layouts/partials/description-or-summary.html b/layouts/partials/description-or-summary.html
index d9c7c8a..b666149 100644
--- a/layouts/partials/description-or-summary.html
+++ b/layouts/partials/description-or-summary.html
@@ -1,5 +1,9 @@
-{{ with .Description }}
-    <p>{{ . | markdownify }}</p>
-{{ else }}
-    {{ .Summary }}
-{{ end }}
+{{- with .Description -}}
+    <p>{{- . | markdownify -}}</p>
+{{- else -}}
+    {{- with .Summary -}}
+        {{- . -}}
+    {{- else -}}
+        {{- .Site.Params.description -}}
+    {{- end -}}
+{{- end -}}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 93c7d3c..975b0ce 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -33,5 +33,5 @@
     {{ partial "seo-tags/author.html" . }}
 
     <meta name="language" content="{{ .Language.Lang }}">
-    <meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage }}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
+    <meta name="description" content="{{ (partial "description-or-summary.html" .) | plainify }}">
 </head>
diff --git a/layouts/partials/seo-tags/opengraph.html b/layouts/partials/seo-tags/opengraph.html
index 935944e..fb791f0 100644
--- a/layouts/partials/seo-tags/opengraph.html
+++ b/layouts/partials/seo-tags/opengraph.html
@@ -1,5 +1,5 @@
 <meta property="og:title" content="{{ .Title | plainify }}">
-<meta property="og:description" content="{{ with .Description }}{{ . }}{{ else }}{{ if .IsPage }}{{ .Summary | plainify }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
+<meta property="og:description" content="{{ (partial "description-or-summary.html" .) | plainify }}">
 <meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}">
 <meta property="og:url" content="{{ .Permalink }}">
 
diff --git a/layouts/partials/seo-tags/schema.html b/layouts/partials/seo-tags/schema.html
index 9f46086..0e4934c 100644
--- a/layouts/partials/seo-tags/schema.html
+++ b/layouts/partials/seo-tags/schema.html
@@ -1,5 +1,5 @@
 <meta itemprop="name" content="{{ .Title | plainify }}">
-<meta itemprop="description" content="{{ with .Description }}{{ . }}{{ else }}{{ if .IsPage }}{{ .Summary | plainify }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
+<meta itemprop="description" content="{{ (partial "description-or-summary.html" .) | plainify }}">
 
 {{ $format := "2006-01-02T15:04:05-07:00" }}
 {{ with .Date }}
diff --git a/layouts/partials/seo-tags/twitter-cards.html b/layouts/partials/seo-tags/twitter-cards.html
index fb3bf7c..1805446 100644
--- a/layouts/partials/seo-tags/twitter-cards.html
+++ b/layouts/partials/seo-tags/twitter-cards.html
@@ -22,7 +22,7 @@
 {{ end }}
 
 <meta name="twitter:title" content="{{ .Title | plainify }}">
-<meta name="twitter:description" content="{{ with .Description }}{{ . }}{{ else }}{{ if .IsPage }}{{ .Summary | plainify }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
+<meta name="twitter:description" content="{{ (partial "description-or-summary.html" .) | plainify }}">
 
 {{ with .Site.Social.twitter }}
     <meta name="twitter:site" content="@{{ . }}">