diff --git a/themes/devopsdays-legacy/layouts/partials/future.html b/themes/devopsdays-legacy/layouts/partials/future.html
index 500cacad1e4..0275d4822a5 100644
--- a/themes/devopsdays-legacy/layouts/partials/future.html
+++ b/themes/devopsdays-legacy/layouts/partials/future.html
@@ -11,9 +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") ( .startdate ) }}
+    {{ if and (eq .year $future_year) (eq .status "current") }}
       {{ $.Scratch.SetInMap "future_years" $future_year $future_year }}
-      {{ $.Scratch.SetInMap (print "future" $future_year) .startdate .friendly }}
+      {{ if .startdate }}
+        {{ $.Scratch.SetInMap (print "future" $future_year) .startdate .friendly }}
+      {{ else }}
+        {{ $.Scratch.SetInMap (print "future" $future_year) "TBD" .friendly }}
+      {{ end }}
     {{ end }}
   {{ end }}
 {{ end }}
@@ -33,7 +37,13 @@ <h1>Future</h1>
                                 <strong>{{ . }}</strong><br/>
                                 {{ range ($.Scratch.GetSortedMapValues (print "future" .)) }}
                                     {{ $c_event := (index $.Site.Data.events .) }}
-                                    <a href="/events/{{ $c_event.name }}">{{ $c_event.city }}: {{ dateFormat "Jan 2" $c_event.startdate }} - {{ dateFormat "Jan 2" $c_event.enddate }}</a><br />
+                                    <a href="/events/{{ $c_event.name }}">{{ $c_event.city }}:
+                                      {{ if $c_event.startdate }}
+                                        {{ dateFormat "Jan 2" $c_event.startdate }} - {{ dateFormat "Jan 2" $c_event.enddate }}
+                                      {{ else }}
+                                        Coming Soon!
+                                      {{ end }}
+                                    </a><br />
                                 {{ end }}
                             {{ end }}
                         </div>
diff --git a/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html b/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html
index 000bed9ef6b..0f1c398fe2d 100644
--- a/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html
+++ b/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html
@@ -1,7 +1,7 @@
 <div class="submenu" style="width:550px">
   <h3>
   {{ range sort $.Site.Data.events "startdate" }}
-    {{ if eq .status "current" }}
+    {{ if  and ( eq .status "current") ( .startdate ) }}
       {{ $.Scratch.Add "events" "<a href = '/events/" }}
       {{ $.Scratch.Add "events" .name }}
       {{ $.Scratch.Add "events" "/welcome'>" }}