diff --git a/src/components/Timetable/TrainTimetable.vue b/src/components/Timetable/TrainTimetable.vue
index 7c9ac75..b3bb750 100644
--- a/src/components/Timetable/TrainTimetable.vue
+++ b/src/components/Timetable/TrainTimetable.vue
@@ -73,12 +73,12 @@ const computedTimetableRows = computed(() => {
     abbrevs = [] as string[];
 
   if (currentPath.departureLineData) {
-    arrivalSpeed = currentPath.departureLineData.routeSpeed;
-    arrivalTracks = currentPath.departureLineData.routeTracks;
-
     departureSpeed = currentPath.departureLineData.routeSpeed;
     departureTracks = currentPath.departureLineData.routeTracks;
 
+    arrivalSpeed = currentPath.departureLineData.routeSpeed;
+    arrivalTracks = currentPath.departureLineData.routeTracks;
+
     realLineNo = currentPath.departureLineData?.realLineNo ?? 0;
     abbrevs = getAbbrevs(currentPath.departureLineData);
   }
@@ -118,6 +118,11 @@ const computedTimetableRows = computed(() => {
 
         correctedDepartureTracks = internalRouteInfo.routeTracks;
         departureTracks = internalRouteInfo.routeTracks;
+
+        if (stopRows.length == 0) {
+          arrivalSpeed = departureSpeed;
+          arrivalTracks = departureTracks;
+        }
       }
 
       let pointAbbrevs = [];
@@ -152,7 +157,6 @@ const computedTimetableRows = computed(() => {
         stockMass,
       };
 
-
       // console.debug(stop.stopNameRAW, stop.departureLine);
 
       arrivalKm = stop.stopDistance;