diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index 2300ddd..a629ee3 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -134,10 +134,12 @@
 								% }
 								% last;
 							% }
-							% if (($station->[2]{dep_countdown} // 0) > 0 and $station->[2]{arr} and $station->[2]{dep}) {
+							% if (($station->[2]{dep_countdown} // 0) > 0 and $station->[2]{dep}) {
 								<%= $station->[0] %><br/>
-								<%= $station->[2]{arr}->strftime('%H:%M') %> →
-								<%= $station->[2]{dep}->strftime('%H:%M') %>
+								% if ($station->[2]{arr}) {
+									<%= $station->[2]{arr}->strftime('%H:%M') %> →
+								% }
+								%= $station->[2]{dep}->strftime('%H:%M')
 								% if ($station->[2]{dep_delay}) {
 									%= sprintf('(%+d)', $station->[2]{dep_dely} / 60);
 								% }
diff --git a/templates/_public_status_card.html.ep b/templates/_public_status_card.html.ep
index 055e15a..b463d15 100644
--- a/templates/_public_status_card.html.ep
+++ b/templates/_public_status_card.html.ep
@@ -98,10 +98,12 @@
 							% }
 							% last;
 						% }
-						% if (($station->[2]{dep_countdown} // 0) > 0 and $station->[2]{arr} and $station->[2]{dep}) {
+						% if (($station->[2]{dep_countdown} // 0) > 0 and $station->[2]{dep}) {
 							<%= $station->[0] %><br/>
-							<%= $station->[2]{arr}->strftime('%H:%M') %> →
-							<%= $station->[2]{dep}->strftime('%H:%M') %>
+							% if ($station->[2]{arr}) {
+								<%= $station->[2]{arr}->strftime('%H:%M') %> →
+							% }
+							%= $station->[2]{dep}->strftime('%H:%M')
 							% if ($station->[2]{dep_delay}) {
 								%= sprintf('(%+d)', $station->[2]{dep_delay} / 60);
 							% }