diff --git a/themes/devopsdays-legacy/layouts/partials/future.html b/themes/devopsdays-legacy/layouts/partials/future.html
index 626838c80ca..2c8b645cb85 100644
--- a/themes/devopsdays-legacy/layouts/partials/future.html
+++ b/themes/devopsdays-legacy/layouts/partials/future.html
@@ -11,13 +11,13 @@
 {{ range seq .Now.Year (add .Now.Year 1) }}
   {{ $future_year := (chomp .) }}
   {{ range $.Site.Data.events }}
-    {{ if and (eq .year $future_year) (eq .status "current") }}
+    {{ if and (eq .year $future_year) (eq .status "current") ( .startdate ) }}
       {{ $.Scratch.SetInMap "future_years" $future_year $future_year }}
       {{ $.Scratch.SetInMap (print "future" $future_year) .startdate .friendly }}
     {{ end }}
   {{ end }}
 {{ end }}
-    
+
 <div class="span-6 last">
     <div style=" padding-top:18px;" class="span-5 last">
         <h1>Future</h1>
diff --git a/themes/devopsdays-legacy/layouts/partials/map.html b/themes/devopsdays-legacy/layouts/partials/map.html
index ee58c350586..02fdeb8c5dd 100644
--- a/themes/devopsdays-legacy/layouts/partials/map.html
+++ b/themes/devopsdays-legacy/layouts/partials/map.html
@@ -22,7 +22,7 @@
     // Get Latitude and Longitude of a Point: http://itouchmap.com/latlong.html
     var markers = [
       {{ range $.Site.Data.events }}
-        {{ if eq .status "current" }}
+        {{ if  and (eq .status "current") ( .startdate ) }}
           ['{{ .city}}', {{ .coordinates | safeJS }}, '{{ dateFormat "Jan 2" .startdate }}', '/events/{{ .friendly }}'],
         {{ end }}
       {{ end }}