diff --git a/content/index.html b/content/index.html
index ce98151a..10390cd4 100644
--- a/content/index.html
+++ b/content/index.html
@@ -34,7 +34,7 @@ feed:
   <div class="span4">
     <h1>Kalender</h1>
     <p>
-    <% allUpcomingEvents = get_public_events().select { |e| e[:startdate].to_datetime > DateTime.now }
+    <% allUpcomingEvents = get_public_events().select { |e| (e[:enddate]||e[:startdate]).to_datetime > DateTime.now }
     if (allUpcomingEvents.size>0)
       allUpcomingEvents.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
     %>
diff --git a/content/sidebar.html b/content/sidebar.html
index f4376456..34e3ccd9 100644
--- a/content/sidebar.html
+++ b/content/sidebar.html
@@ -1,7 +1,7 @@
 -----
 style: none
 -----
-<% upcomingEvents = get_public_events().select { |e| e[:startdate].to_datetime > DateTime.now }
+<% upcomingEvents = get_public_events().select { |e| (e[:enddate]||e[:startdate]).to_datetime > DateTime.now }
 if (upcomingEvents.size>0)
   upcomingEvents.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
 %>