diff --git a/snipts/templates/snipts/snipt-list.html b/snipts/templates/snipts/snipt-list.html
index ff23a49..fdc00ad 100644
--- a/snipts/templates/snipts/snipt-list.html
+++ b/snipts/templates/snipts/snipt-list.html
@@ -47,20 +47,22 @@
                     </li>
                 {% endif %}
             </ul>
-            <section class="tags">
-                <h2>{{ snipt.tags.all|length }} tag{{ snipt.tags.all|pluralize }}</h2>
-                <ul>
-                    {% for tag in snipt.sorted_tags %}
-                        <li {% if forloop.counter > 3 and not detail %}class="hidden"{% endif %}>
-                            {% if public %}
-                                <a href="/public/tag/{{ tag.slug }}/">{{ tag }}</a>
-                            {% else %}
-                                <a href="/{{ snipt.user.username }}/tag/{{ tag.slug }}/">{{ tag }}</a>
-                            {% endif %}
-                        </li>
-                    {% endfor %}
-                </ul>
-            </section>
+            {% if snipt.tags.all %}
+                <section class="tags">
+                    <h2>{{ snipt.tags.all|length }} tag{{ snipt.tags.all|pluralize }}</h2>
+                    <ul>
+                        {% for tag in snipt.sorted_tags %}
+                            <li {% if forloop.counter > 3 and not detail %}class="hidden"{% endif %}>
+                                {% if public %}
+                                    <a href="/public/tag/{{ tag.slug }}/">{{ tag }}</a>
+                                {% else %}
+                                    <a href="/{{ snipt.user.username }}/tag/{{ tag.slug }}/">{{ tag }}</a>
+                                {% endif %}
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </section>
+            {% endif %}
         </aside>
     </div>
     <footer>
diff --git a/snipts/templates/snipts/tags-user.html b/snipts/templates/snipts/tags-user.html
index 0c5df07..11a9ba7 100644
--- a/snipts/templates/snipts/tags-user.html
+++ b/snipts/templates/snipts/tags-user.html
@@ -1,10 +1,12 @@
-<section class="tags">
-    <h1>{{ user.username }}'s tags</h1>
-    <ul>
-        {% for t in tags %}
-            <li>
-                <a {% if tag.name == t.name %}class="active"{% endif %} href="/{{ user.username }}/tag/{{ t.slug }}/">{{ t.name }} ({{ t.count }})</a>
-            </li>
-        {% endfor %}
-    </ul>
-</section>
+{% if tags %}
+    <section class="tags">
+        <h1>{{ user.username }}'s tags</h1>
+        <ul>
+            {% for t in tags %}
+                <li>
+                    <a {% if tag.name == t.name %}class="active"{% endif %} href="/{{ user.username }}/tag/{{ t.slug }}/">{{ t.name }} ({{ t.count }})</a>
+                </li>
+            {% endfor %}
+        </ul>
+    </section>
+{% endif %}