diff --git a/src/app/view/editor-main-view/data-views/trainrunsections.view.ts b/src/app/view/editor-main-view/data-views/trainrunsections.view.ts
index 7c40e4a79..1b2c75767 100644
--- a/src/app/view/editor-main-view/data-views/trainrunsections.view.ts
+++ b/src/app/view/editor-main-view/data-views/trainrunsections.view.ts
@@ -1559,7 +1559,7 @@ export class TrainrunSectionsView {
       })
       .classed(StaticDomTags.TAG_HIDDEN, (d: TrainrunSectionViewObject) => {
         const trainrunSection = d.trainrunSections.at(atTarget ? -1 : 0)!;
-        return this.getHiddenTagForTime(d.trainrunSections[0], textElement);
+        return this.getHiddenTagForTime(trainrunSection, textElement);
       })
       .classed(StaticDomTags.TAG_EVENT_DISABLED, !enableEvents)
       .text((d: TrainrunSectionViewObject) =>
@@ -1655,8 +1655,8 @@ export class TrainrunSectionsView {
         TrainrunSectionsView.isMuted(d.trainrunSections[0], selectedTrainrun, connectedTrainIds),
       )
       .classed(StaticDomTags.TAG_WARNING, (d: TrainrunSectionViewObject) => {
-        const trainrunSections = d.trainrunSections.at(atSource ? 0 : -1);
-        return TrainrunSectionsView.hasWarning(d.trainrunSections[0], textElement);
+        const trainrunSection = d.trainrunSections.at(atSource ? 0 : -1);
+        return TrainrunSectionsView.hasWarning(trainrunSection, textElement);
       })
       .classed(StaticDomTags.TAG_EVENT_DISABLED, true)
       .classed(StaticDomTags.TAG_START_TEXT_ANCHOR, (d: TrainrunSectionViewObject) =>