diff --git a/kotti_blog/templates/blog-view.pt b/kotti_blog/templates/blog-view.pt
index 6baf09f..5719586 100644
--- a/kotti_blog/templates/blog-view.pt
+++ b/kotti_blog/templates/blog-view.pt
@@ -24,11 +24,14 @@
         </h2>
         <div class="blog-metadata">
           <span class="date" tal:content="api.format_datetime(item.date)" />
-          | <tal:block i18n:translate="">Categories</tal:block>:
-          <span class="categories">
-            <tal:block tal:repeat="tag item.tags">
-            <a href="${api.url(context)}categories/${tag}">${tag}</a><tal:block tal:condition="not: repeat.tag.end">,</tal:block>
-            </tal:block></span>
+          <tal:categories tal:condition="item.tags">
+            | <tal:block i18n:translate="">Categories</tal:block>:
+            <span class="categories">
+              <tal:block tal:repeat="tag item.tags">
+                <a href="${api.url(context)}categories/${tag}">${tag}</a><tal:block tal:condition="not: repeat.tag.end">,</tal:block>
+              </tal:block>
+            </span>
+          </tal:categories>
         </div>
         <p>${structure: item.body}</p>
       </div>
diff --git a/kotti_blog/templates/blogentry-view.pt b/kotti_blog/templates/blogentry-view.pt
index 444dcc7..cf099df 100644
--- a/kotti_blog/templates/blogentry-view.pt
+++ b/kotti_blog/templates/blogentry-view.pt
@@ -11,11 +11,14 @@
       <h1>${api.context.title}</h1>
       <div class="blog-metadata">
         <span class="date" tal:content="api.format_datetime(context.date)" />
-        | <tal:block i18n:translate="">Categories</tal:block>:
-        <span class="categories">
-          <tal:block tal:repeat="tag context.tags">
-          <a href="${api.url(context.parent)}categories/${tag}">${tag}</a><tal:block tal:condition="not: repeat.tag.end">,</tal:block>
-          </tal:block></span>
+        <tal:categories tal:condition="context.tags">
+          | <tal:block i18n:translate="">Categories</tal:block>:
+          <span class="categories">
+            <tal:block tal:repeat="tag context.tags">
+              <a href="${api.url(context.parent)}categories/${tag}">${tag}</a><tal:block tal:condition="not: repeat.tag.end">,</tal:block>
+            </tal:block>
+          </span>
+        </tal:categories>
       </div>
       <p class="description">
         ${api.context.description}