diff --git a/content/index.html b/content/index.html
index 10390cd4..9098829f 100644
--- a/content/index.html
+++ b/content/index.html
@@ -43,7 +43,7 @@ feed:
   </div>
 </div>
 <div class="row">
-  <% upcomingEvents = get_events().select { |e| e[:startdate].to_datetime > DateTime.now }
+  <% upcomingEvents = get_events(true).select { |e| e[:startdate].to_datetime > DateTime.now }
   if (upcomingEvents.size>0)
     upcomingEvents.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
   %>
@@ -52,9 +52,11 @@ feed:
       <article itemscope itemtype="http://schema.org/EducationEvent">
         <h1><a href="<%= upcomingEvents[0].path() %>">Nächster Vortrag</a></h1>
         <%= render 'event_header', :item => upcomingEvents[0], :heading => false, :link => false %>
+        <% if upcomingEvents[0].path() %>
         <p>
           <a itemprop="url" href="<%= upcomingEvents[0].path() %>">Weitere Informationen</a>
         </p>
+        <% end %>
         <p>
           Während des Vortrags besteht die Möglichkeit, <a href="/events/stream/">per Livestream und Chat</a> mitzudiskutieren.
         </p>
diff --git a/lib/eventhelpers.rb b/lib/eventhelpers.rb
index 0112f123..c392ea28 100644
--- a/lib/eventhelpers.rb
+++ b/lib/eventhelpers.rb
@@ -1,5 +1,5 @@
-def get_events()
-  items.select { |i| (i[:kind]=='event') && i.identifier.start_with?('/events') }
+def get_events(includePlaceholders = false)
+  items.select { |i| (i[:kind]=='event') && (i.identifier.start_with?('/events') || (includePlaceholders && i.identifier.start_with?('/_data/platzhalter'))) }
 end
 
 def generate_event_pages()