diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index ebe84e8..a50aa3e 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -8,15 +8,12 @@
 				data-arrival="<%= $journey->{real_arrival}->epoch %>">
 				% if ($journey->{departure_countdown} > 120) {
 					Abfahrt in <%= sprintf('%.f', $journey->{departure_countdown} / 60) %> Minuten
-					<br/>von Gleis <%= $journey->{dep_platform} %>
 				% }
 				% elsif ($journey->{departure_countdown} > 60) {
 					Abfahrt in einer Minute
-					<br/>von Gleis <%= $journey->{dep_platform} %>
 				% }
 				% elsif ($journey->{departure_countdown} > 0) {
 					Abfahrt in weniger als einer Minute
-					<br/>von Gleis <%= $journey->{dep_platform} %>
 				% }
 				% elsif (defined $journey->{arrival_countdown}) {
 					% if ($journey->{arrival_countdown} > 60) {
@@ -29,13 +26,16 @@
 					% else {
 						Ziel erreicht
 					% }
-					% if ($journey->{arrival_countdown} < (60 * 15)) {
+					% if ($journey->{arrival_countdown} < (60 * 15) and $journey->{arr_platform}) {
 						<br/>auf Gleis <%= $journey->{arr_platform} %>
 					% }
 				% }
 				% elsif ($journey->{arr_name}) {
 					Ankunft in mehr als zwei Stunden
 				% }
+				% if ($journey->{departure_countdown} > 0 and $journey->{dep_platform}) {
+					<br/>von Gleis <%= $journey->{dep_platform} %>
+				% }
 			</div>
 			<div class="progress" style="height: 1ex;">
 				<div class="determinate" style="width: <%= sprintf('%.2f', 100 * ($journey->{journey_completion} // 0)); %>%;"></div>
diff --git a/templates/_connections.html.ep b/templates/_connections.html.ep
index d421d4e..2506829 100644
--- a/templates/_connections.html.ep
+++ b/templates/_connections.html.ep
@@ -22,7 +22,7 @@
 				% if ($train->departure_delay) {
 					%= sprintf('(%+d)', $train->departure_delay)
 				% }
-				<br/>Gleis <%= $train->platform %></td>
+				<br/>Gleis <%= $train->platform || '?' %></td>
 		</tr>
 	% }
 </tbody></table></div>
@@ -50,7 +50,7 @@
 				% if ($train->departure_delay) {
 					%= sprintf('(%+d)', $train->departure_delay)
 				% }
-			</td><td>Gleis <%= $train->platform %></td>
+			</td><td>Gleis <%= $train->platform || '?' %></td>
 		</tr>
 	% }
 </tbody></table></div>
diff --git a/templates/_public_status_card.html.ep b/templates/_public_status_card.html.ep
index c806b17..ebf989b 100644
--- a/templates/_public_status_card.html.ep
+++ b/templates/_public_status_card.html.ep
@@ -33,7 +33,7 @@
 						% else {
 							Ziel erreicht
 						% }
-						% if ($journey->{arrival_countdown} < (60 * 15)) {
+						% if ($journey->{arrival_countdown} < (60 * 15) and $journey->{arr_platform}) {
 							<br/>auf Gleis <%= $journey->{arr_platform} %>
 						% }
 					% }