diff --git a/theme/templates/tag.html b/theme/templates/tag.html
index 553c740..858063e 100644
--- a/theme/templates/tag.html
+++ b/theme/templates/tag.html
@@ -9,15 +9,16 @@
 {% block content_body %}
 {% from 'includes/macros.html' import ci %}
 {% for article in articles %}
+{% set link = article.featured_image[0].link | default("/" + article.save_as) %}
 <article class="tag-entry">
   <div class="tag-content">
-    <h2><a href="{{ article.featured_image[0].link }}">{{ article.title }}</a></h2>  
+    <h2><a href="{{ link }}">{{ article.title }}</a></h2>  
     {{ article.summary }}
   </div>
   <div class="tag-image">
   {% if article.featured_image %}
   {% set i = article.featured_image[0] %}
-    {{ ci('../' + i.pic, i.link | default("/" + article.save_as), i.alt | default("Titelbild von " + article.title), i.title | default(article.title), i.credit, i.credit_link) }}
+    {{ ci('../' + i.pic, link, i.alt | default("Titelbild von " + article.title), i.title | default(article.title), i.credit, i.credit_link) }}
   {% endif %}
   </div>
 </article>