diff --git a/_includes/page__taxonomy.html b/_includes/page__taxonomy.html
index a77f1d0f..9bb6c61c 100644
--- a/_includes/page__taxonomy.html
+++ b/_includes/page__taxonomy.html
@@ -1,7 +1,7 @@
-{% if page.tags[0] %}
+{% if site.tags.type and page.tags[0] %}
{% include tag-list.html %}
{% endif %}
-{% if page.categories[0] %}
+{% if site.categories.type and page.categories[0] %}
{% include category-list.html %}
{% endif %}
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index a48d2bd6..9875cb36 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -30,7 +30,7 @@ layout: compress
{% endif %}
- {% if site.breadcrumbs %}
+ {% if site.breadcrumbs and site.categories.type %}
{% include breadcrumbs.html %}
{% endif %}