diff --git a/src/components/TrainsView/TrainSchedule.vue b/src/components/TrainsView/TrainSchedule.vue
index ae7eb40..2d11921 100644
--- a/src/components/TrainsView/TrainSchedule.vue
+++ b/src/components/TrainsView/TrainSchedule.vue
@@ -35,9 +35,9 @@ p
       </ul>
     </div>
 
-    <div class="schedule-wrapper">
+    <div class="schedule-wrapper" v-if="train.timetableData">
       <ul class="stop_list">
-        <li v-for="(stop, i) in train.timetableData!.followingStops" :key="i" class="stop" :class="addClasses(stop, i)">
+        <li v-for="(stop, i) in train.timetableData.followingStops" :key="i" class="stop" :class="addClasses(stop, i)">
           <span class="stop_info">
             <div class="indicator"></div>
 
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index e5d9199..6b88b33 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -25,7 +25,7 @@
             <TrainInfo :train="train" />
 
             <TrainSchedule
-              v-if="train.timetableData && chosenTrainId == getTrainId(train)"
+              v-if="chosenTrainId == getTrainId(train)"
               :train="train"
               ref="card-inner"
               tabindex="0"