diff --git a/app/Http/Controllers/FrontendTransportController.php b/app/Http/Controllers/FrontendTransportController.php
index bfe1a310d..07d466ad1 100644
--- a/app/Http/Controllers/FrontendTransportController.php
+++ b/app/Http/Controllers/FrontendTransportController.php
@@ -127,6 +127,7 @@ public function TrainTrip(Request $request): Renderable|RedirectResponse {
                 // in long term to support multiple data providers we only support IDs here - no IBNRs.
                 $startStation = Station::findOrFail($validated['start']);
             }
+
             $departure = Carbon::parse($validated['departure']);
 
             $trip = TrainCheckinController::getHafasTrip(
@@ -137,9 +138,9 @@ public function TrainTrip(Request $request): Renderable|RedirectResponse {
 
             $encounteredStart = false;
             $stopovers = $trip->stopovers
-                ->filter(function(Stopover $stopover) use ($departure, $startStation, &$encounteredStart): bool {
+                ->filter(function(Stopover $stopover) use ($startStation, &$encounteredStart): bool {
                     if (!$encounteredStart) { // this assumes stopovers being ordered correctly
-                        $encounteredStart = $stopover->departure_planned == $departure && $stopover->station->is($startStation);
+                        $encounteredStart = $stopover->station->is($startStation);
                         return false;
                     }
                     return true;
diff --git a/resources/vue/components/CheckinInterface.vue b/resources/vue/components/CheckinInterface.vue
index a799bc258..01d6a62fb 100644
--- a/resources/vue/components/CheckinInterface.vue
+++ b/resources/vue/components/CheckinInterface.vue
@@ -38,7 +38,7 @@ export default {
                 business: this.business,
                 ibnr: true,
                 tripId: this.selectedTrain.tripId,
-                lineName: this.selectedTrain.line.name,
+                lineName: this.selectedTrain.line.name ?? this.selectedTrain.line.fahrtNr,
                 start: this.selectedTrain.stop.id,
                 destination: this.selectedDestination.evaIdentifier,
                 departure: DateTime.fromISO(this.selectedTrain.plannedWhen).setZone("UTC").toISO(),
diff --git a/resources/vue/components/Stationboard.vue b/resources/vue/components/Stationboard.vue
index 1e33c5845..b458bb854 100644
--- a/resources/vue/components/Stationboard.vue
+++ b/resources/vue/components/Stationboard.vue
@@ -135,7 +135,7 @@ export default {
                 <ProductIcon :product="selectedTrain.line.product"/>
             </div>
             <div class="col-auto align-items-center d-flex me-3">
-                <LineIndicator :product-name="selectedTrain.line.product" :number="selectedTrain.line.name"/>
+                <LineIndicator :product-name="selectedTrain.line.product" :number="selectedTrain.line.name !== null ? selectedTrain.line.name : selectedTrain.line.fahrtNr"/>
             </div>
             <template v-if="selectedDestination">
                 <div class="col-auto align-items-center d-flex me-3">
@@ -164,7 +164,7 @@ export default {
                     <ProductIcon :product="item.line.product"/>
                 </div>
                 <div class="col-2 align-items-center d-flex me-3 justify-content-center">
-                    <LineIndicator :productName="item.line.product" :number="item.line.name"/>
+                    <LineIndicator :productName="item.line.product" :number="item.line.name !== null ? item.line.name : item.line.fahrtNr"/>
                 </div>
                 <div class="col align-items-center d-flex second-stop">
                     <div>