diff --git a/layouts/partials/taxonomy_terms_article_wrapper.html b/layouts/partials/taxonomy_terms_article_wrapper.html
index 3631240ecc..7730bc0cb0 100644
--- a/layouts/partials/taxonomy_terms_article_wrapper.html
+++ b/layouts/partials/taxonomy_terms_article_wrapper.html
@@ -1,7 +1,13 @@
 {{ $context := . }}
-{{ if isset .Site.Params.Taxonomy "taxonomypageheader" }}
-  {{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }}
-    {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo) }}
+{{ if isset .Site.Params "taxonomy" }}
+  {{ if isset .Site.Params.Taxonomy "taxonomypageheader" }}
+    {{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }}
+      {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo) }}
+    {{ end }}
+  {{ else }}
+    {{ range $taxo, $taxo_map := .Site.Taxonomies }}
+      {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo) }}
+    {{ end }}
   {{ end }}
 {{ else }}
   {{ range $taxo, $taxo_map := .Site.Taxonomies }}
diff --git a/layouts/partials/taxonomy_terms_clouds.html b/layouts/partials/taxonomy_terms_clouds.html
index b7e4d342f0..a1b41556a9 100644
--- a/layouts/partials/taxonomy_terms_clouds.html
+++ b/layouts/partials/taxonomy_terms_clouds.html
@@ -1,12 +1,18 @@
 {{ $context := . }}
-{{ if isset .Site.Params.Taxonomy "taxonomycloud" }}
-	{{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyCloud }}
-		{{ if isset $.Site.Params.Taxonomy "taxonomycloudtitle" }}
-			{{ $.Scratch.Set "title" (index $.Site.Params.Taxonomy.taxonomyCloudTitle $index) }}
-		{{ else }}
-			{{ $.Scratch.Set "title" (humanize $taxo) }}
+{{ if isset .Site.Params "taxonomy" }}
+	{{ if isset .Site.Params.Taxonomy "taxonomycloud" }}
+		{{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyCloud }}
+			{{ if isset $.Site.Params.Taxonomy "taxonomycloudtitle" }}
+				{{ $.Scratch.Set "title" (index $.Site.Params.Taxonomy.taxonomyCloudTitle $index) }}
+			{{ else }}
+				{{ $.Scratch.Set "title" (humanize $taxo) }}
+			{{ end }}
+			{{ partial "taxonomy_terms_cloud.html" (dict "context" $context "taxo" $taxo "title" ($.Scratch.Get "title")) }}
+		{{ end }}
+	{{ else }}
+		{{ range $taxo, $taxo_map := .Site.Taxonomies }}
+			{{ partial "taxonomy_terms_cloud.html" (dict "context" $context "taxo" $taxo "title" (humanize $taxo)) }}
 		{{ end }}
-		{{ partial "taxonomy_terms_cloud.html" (dict "context" $context "taxo" $taxo "title" ($.Scratch.Get "title")) }}
 	{{ end }}
 {{ else }}
 	{{ range $taxo, $taxo_map := .Site.Taxonomies }}