diff --git a/src/components/SceneryView/ScheduledTrainStatus.vue b/src/components/SceneryView/ScheduledTrainStatus.vue
index 4610e6c..5faa761 100644
--- a/src/components/SceneryView/ScheduledTrainStatus.vue
+++ b/src/components/SceneryView/ScheduledTrainStatus.vue
@@ -26,23 +26,18 @@ export default defineComponent({
     computedScheduledTrain() {
       const { status, prevElement, currentElement, nextElement } = this.sceneryTimetableRow;
 
-      const prevDepartureIndicator = prevElement?.departureRouteExt
-        ? `(${prevElement.departureRouteExt}) ${prevElement.stationName}`
-        : '---';
-
-      const nextArrivalIndicator = nextElement?.arrivalRouteExt
-        ? `(${nextElement.arrivalRouteExt}) ${nextElement.stationName}`
-        : `${currentElement.stationName}`;
-
-      let stopStatusDescription = '',
-        stopStatusIndicator = '';
+      let stopStatusIndicator = '';
 
       switch (status) {
         case StopStatus.ARRIVING:
-          stopStatusIndicator = this.$t('timetables.desc-arriving', {
-            prevStationName: prevElement?.stationName ?? '',
-            prevDepartureLine: prevElement?.departureRouteExt ?? ''
-          });
+          if (prevElement) {
+            stopStatusIndicator = this.$t('timetables.desc-arriving', {
+              prevStationName: prevElement?.stationName ?? '',
+              prevDepartureLine: prevElement?.departureRouteExt ?? ''
+            });
+          } else {
+            stopStatusIndicator = this.$t('timetables.desc-beginning');
+          }
           break;
 
         case StopStatus.ONLINE:
@@ -56,8 +51,6 @@ export default defineComponent({
           break;
 
         case StopStatus.DEPARTED:
-          // stopStatusIndicator = `${this.$t('timetables.to')}: ${nextArrivalIndicator}`;
-
           if (!nextElement?.stationName) {
             stopStatusIndicator = this.$t('timetables.desc-departed-ends', {
               nextStationName: currentElement.stationName
@@ -72,7 +65,6 @@ export default defineComponent({
           break;
 
         case StopStatus.DEPARTED_AWAY:
-          // stopStatusIndicator = `${this.$t('timetables.to')}: ${nextArrivalIndicator}`;
           stopStatusIndicator = this.$t('timetables.desc-departed-away', {
             nextStationName: nextElement?.stationName,
             nextArrivalLine: nextElement?.arrivalRouteExt
@@ -80,7 +72,6 @@ export default defineComponent({
           break;
 
         case StopStatus.TERMINATED:
-          // stopStatusIndicator = `X ${this.$t('timetables.desc-terminated')}`;
           stopStatusIndicator = this.$t('timetables.desc-terminated');
           break;
 
diff --git a/src/locales/en.json b/src/locales/en.json
index 0c8f1d2..dd9e8f9 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -591,6 +591,7 @@
     "terminates": "TERMINATES\nHERE",
     "from": "Arrives from",
     "to": "Departs to",
+    "desc-beginning": "The train begins here",
     "desc-arriving": "<i>Arrives from: <b>{prevStationName} ({prevDepartureLine})</b></i>",
     "desc-online": "On scenery / <i>direction: <b>{nextStationName} ({nextArrivalLine})</b></i>",
     "desc-stopped": "On scenery - stopped / <i>direction: <b>{nextStationName} ({nextArrivalLine})</b></i>",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 350a6bf..b0ba93a 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -577,6 +577,7 @@
     "terminates": "KOŃCZY BIEG",
     "from": "Przyjedzie z",
     "to": "Odjeżdża do",
+    "desc-beginning": "Pociąg rozpoczyna bieg",
     "desc-arriving": "<i>Przyjedzie z: <b>{prevStationName} ({prevDepartureLine})</b></i>",
     "desc-online": "Na scenerii / <i>kierunek: <b>{nextStationName} ({nextArrivalLine})</b></i>",
     "desc-stopped": "Na scenerii - postój / <i>kierunek: <b>{nextStationName} ({nextArrivalLine})</b></i>",