diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
index 5a71098..0ae2a3c 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
@@ -43,8 +43,12 @@
           <span :class="{ 'no-catenary': !route.isElectric, internal: route.isInternal }">
             {{ route.routeName }}
           </span>
-          <span v-if="route.routeSpeed" class="speed">{{ route.routeSpeed }}</span>
-          <span v-if="route.routeSpeedExit" class="speed">| {{ route.routeSpeedExit }}</span>
+          <span v-if="route.routeSpeed" class="speed">
+            <span>{{ route.routeSpeed }}</span>
+            <span v-if="route.routeSpeedExit && route.routeSpeedExit != route.routeSpeed">
+              | {{ route.routeSpeedExit }}
+            </span>
+          </span>
           <span v-if="route.routeLength" class="length">
             {{ (route.routeLength / 1000).toFixed(1) + 'km' }}
           </span>
@@ -156,7 +160,7 @@ ul.routes-list {
     -moz-user-select: none;
     -webkit-user-select: none;
 
-    span {
+    & > span {
       padding: 0.2em;
       background-color: #007599;
       font-weight: bold;
diff --git a/src/components/TrainsView/TrainSchedule.vue b/src/components/TrainsView/TrainSchedule.vue
index d7b7cdf..c447ef4 100644
--- a/src/components/TrainsView/TrainSchedule.vue
+++ b/src/components/TrainsView/TrainSchedule.vue
@@ -68,7 +68,8 @@
                     <span>
                       |
                       {{
-                        stop.departureLineInfo.routeSpeedExit
+                        stop.departureLineInfo.routeSpeedExit &&
+                        stop.departureLineInfo.routeSpeedExit != stop.departureLineInfo.routeSpeed
                           ? `${stop.departureLineInfo.routeSpeedExit} (${stop.departureLineInfo.routeSpeed})`
                           : stop.departureLineInfo.routeSpeed
                       }}</span
@@ -121,10 +122,16 @@
                   <span> {{ stop.nextPointRef.arrivalLine }}</span>
 
                   <span v-if="stop.nextPointRef.arrivalLineInfo">
-                    <span> | {{ stop.nextPointRef.arrivalLineInfo!.routeSpeed }}</span>
-                    <span v-if="stop.nextPointRef.arrivalLineInfo!.routeSpeedExit"
-                      >({{ stop.nextPointRef.arrivalLineInfo!.routeSpeedExit }})</span
+                    <span> | {{ stop.nextPointRef.arrivalLineInfo.routeSpeed }}</span>
+                    <span
+                      v-if="
+                        stop.nextPointRef.arrivalLineInfo.routeSpeedExit &&
+                        stop.nextPointRef.arrivalLineInfo.routeSpeedExit !=
+                          stop.nextPointRef.arrivalLineInfo.routeSpeed
+                      "
                     >
+                      ({{ stop.nextPointRef.arrivalLineInfo.routeSpeedExit }})
+                    </span>
 
                     <img
                       :src="