diff --git a/material/partials/content.html b/material/partials/content.html
index ff9eedfa0..351ec9869 100644
--- a/material/partials/content.html
+++ b/material/partials/content.html
@@ -1,7 +1,7 @@
 {#-
   This file was automatically generated - do not edit
 -#}
-{% if "material/tags" in config.plugins %}
+{% if "material/tags" in config.plugins and tags %}
   {% include "partials/tags.html" %}
 {% endif %}
 {% include "partials/actions.html" %}
diff --git a/material/partials/tags.html b/material/partials/tags.html
index 20c28bc3f..128e95954 100644
--- a/material/partials/tags.html
+++ b/material/partials/tags.html
@@ -4,25 +4,23 @@
 {% if page.meta and page.meta.hide %}
   {% set hidden = "hidden" if "tags" in page.meta.hide %}
 {% endif %}
-{% if tags %}
-  <nav class="md-tags" {{ hidden }}>
-    {% for tag in tags %}
-      {% set icon = "" %}
-      {% if config.extra.tags %}
-        {% set icon = " md-tag-icon" %}
-        {% if tag.type %}
-          {% set icon = icon ~ " md-tag--" ~ tag.type %}
-        {% endif %}
+<nav class="md-tags" {{ hidden }}>
+  {% for tag in tags %}
+    {% set icon = "" %}
+    {% if config.extra.tags %}
+      {% set icon = " md-tag-icon" %}
+      {% if tag.type %}
+        {% set icon = icon ~ " md-tag--" ~ tag.type %}
       {% endif %}
-      {% if tag.url %}
-        <a href="{{ tag.url | url }}" class="md-tag{{ icon }}">
-          {{- tag.name -}}
-        </a>
-      {% else %}
-        <span class="md-tag{{ icon }}">
-          {{- tag.name -}}
-        </span>
-      {% endif %}
-    {% endfor %}
-  </nav>
-{% endif %}
+    {% endif %}
+    {% if tag.url %}
+      <a href="{{ tag.url | url }}" class="md-tag{{ icon }}">
+        {{- tag.name -}}
+      </a>
+    {% else %}
+      <span class="md-tag{{ icon }}">
+        {{- tag.name -}}
+      </span>
+    {% endif %}
+  {% endfor %}
+</nav>
diff --git a/src/partials/content.html b/src/partials/content.html
index 6ec8b42d9..2b78b09ba 100644
--- a/src/partials/content.html
+++ b/src/partials/content.html
@@ -21,7 +21,7 @@
 -->
 
 <!-- Tags -->
-{% if "material/tags" in config.plugins %}
+{% if "material/tags" in config.plugins and tags %}
   {% include "partials/tags.html" %}
 {% endif %}
 
diff --git a/src/partials/tags.html b/src/partials/tags.html
index ccece1cfe..b3dea295c 100644
--- a/src/partials/tags.html
+++ b/src/partials/tags.html
@@ -26,29 +26,27 @@
 {% endif %}
 
 <!-- Tags -->
-{% if tags %}
-  <nav class="md-tags" {{ hidden }}>
-    {% for tag in tags %}
-      {% set icon = "" %}
-      {% if config.extra.tags %}
-        {% set icon = " md-tag-icon" %}
-        {% if tag.type %}
-          {% set icon = icon ~ " md-tag--" ~ tag.type %}
-        {% endif %}
+<nav class="md-tags" {{ hidden }}>
+  {% for tag in tags %}
+    {% set icon = "" %}
+    {% if config.extra.tags %}
+      {% set icon = " md-tag-icon" %}
+      {% if tag.type %}
+        {% set icon = icon ~ " md-tag--" ~ tag.type %}
       {% endif %}
+    {% endif %}
 
-      <!-- Render tag with link -->
-      {% if tag.url %}
-        <a href="{{ tag.url | url }}" class="md-tag{{ icon }}">
-          {{- tag.name -}}
-        </a>
+    <!-- Render tag with link -->
+    {% if tag.url %}
+      <a href="{{ tag.url | url }}" class="md-tag{{ icon }}">
+        {{- tag.name -}}
+      </a>
 
-      <!-- Render tag without link -->
-      {% else %}
-        <span class="md-tag{{ icon }}">
-          {{- tag.name -}}
-        </span>
-      {% endif %}
-    {% endfor %}
-  </nav>
-{% endif %}
+    <!-- Render tag without link -->
+    {% else %}
+      <span class="md-tag{{ icon }}">
+        {{- tag.name -}}
+      </span>
+    {% endif %}
+  {% endfor %}
+</nav>