diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html
index 88d28eb0..f385aa5e 100644
--- a/fet2020/templates/home.html
+++ b/fet2020/templates/home.html
@@ -47,7 +47,9 @@
                     {% endwith %}
                 {% endif %}
                 {% for post in featured_meeting %}
-                    {% include 'posts/partials/_article_row.html' %}
+                    {% if post %}
+                        {% include 'posts/partials/_article_row.html' %}
+                    {% endif %}
                 {% endfor %}
 			</div>
 		</section>
@@ -70,7 +72,7 @@
 				<h2 class="section-title section-title-margins">Zuletzt veröffentlicht</h2>
                 
                 {% if featured_post %}
-                    {% with post=featured_event %}
+                    {% with post=featured_post %}
                         {% include 'posts/partials/_posts_pinned.html' %}
                     {% endwith %}
                 {% endif %}
diff --git a/fet2020/templates/posts/partials/_posts_pinned.html b/fet2020/templates/posts/partials/_posts_pinned.html
index 2c2d753e..2ed55ee4 100644
--- a/fet2020/templates/posts/partials/_posts_pinned.html
+++ b/fet2020/templates/posts/partials/_posts_pinned.html
@@ -18,11 +18,7 @@
                 <a href="{{ post.url }}"><h3 class="text-gray-50">{{ post.title | safe }}</h3></a>
                 <div class="text-gray-200">
                     <i class="fas fa-clock"></i>
-                    {% if post.post_type != 'N' %}
-                        {{ post.event_start|date:"d. F Y" }}
-                    {% else %}
-                        {{ post.public_date|date:"d. F Y" }}
-                    {% endif %}
+                    {{ post.date|date:"d. F Y" }}
                 </div>
             </div>
         </div>