diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue
index d876198..2a2bbb8 100644
--- a/src/components/SceneryView/SceneryInfo.vue
+++ b/src/components/SceneryView/SceneryInfo.vue
@@ -41,7 +41,7 @@
 
         <span class="schedules">
           <img :src="timetableIcon" alt="icon-timetable" />
-          <span v-if="stationInfo.scheduledTrains">
+          <span>
             <span style="color: #eee">{{
               stationInfo.scheduledTrains.length
             }}</span>
diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index 96f7cb9..c1a74aa 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -18,7 +18,11 @@
 
     <div
       class="checkpoints"
-      v-if="stationInfo && stationInfo.online && stationInfo.checkpoints"
+      v-if="
+        stationInfo &&
+        stationInfo.scheduledTrains.length > 0 &&
+        stationInfo.checkpoints
+      "
     >
       <button
         class="checkpoint_item btn--text"
@@ -31,9 +35,9 @@
       </button>
     </div>
 
-    <span class="timetable-item loading" v-if="dataStatus == 0">{{
-      $t("app.loading")
-    }}</span>
+    <span class="timetable-item loading" v-if="dataStatus == 0">
+      {{ $t("app.loading") }}
+    </span>
 
     <span
       class="timetable-item empty"
@@ -203,7 +207,7 @@ export default defineComponent({
   methods: {
     loadSelectedOption() {
       if (!this.stationInfo) return;
-      if (!this.stationInfo.checkpoints) return;
+      if (this.stationInfo.checkpoints.length == 0) return;
       if (this.selectedCheckpoint != "") return;
 
       this.selectedCheckpoint = this.stationInfo.checkpoints[0].checkpointName;
diff --git a/src/scripts/interfaces/Station.ts b/src/scripts/interfaces/Station.ts
index 591c1de..7259532 100644
--- a/src/scripts/interfaces/Station.ts
+++ b/src/scripts/interfaces/Station.ts
@@ -1,4 +1,3 @@
-import Train from "./Train";
 import ScheduledTrain from "./ScheduledTrain";
 
 export default interface Station {
@@ -37,12 +36,10 @@ export default interface Station {
     twoWay: { catenary: number; noCatenary: number };
   };
 
-  checkpoints:
-    | {
-        checkpointName: string;
-        scheduledTrains: ScheduledTrain[];
-      }[]
-    | null;
+  checkpoints: {
+    checkpointName: string;
+    scheduledTrains: ScheduledTrain[];
+  }[];
 
   stops: string[] | null;
 
diff --git a/src/store/index.ts b/src/store/index.ts
index 1e463bf..509d4f0 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -264,7 +264,7 @@ export const store = createStore<State>({
             noCatenary: station[13] as number
           }
         },
-        checkpoints: station[14] ? (station[14] as string[]).map(sub => ({ checkpointName: sub, scheduledTrains: [] })) : null,
+        checkpoints: station[14] ? (station[14] as string[]).map(sub => ({ checkpointName: sub, scheduledTrains: [] })) : [],
         stops: station[15] as string[],
 
         default: station[16] as boolean,
@@ -385,9 +385,11 @@ export const store = createStore<State>({
             if (stopName.includes(stationName) && !stop.stopName.includes("po.") && !stop.stopName.includes("podg.")) return true;
             if (stationName.includes(stopName) && !stop.stopName.includes("po.") && !stop.stopName.includes("podg.")) return true;
             if (stopName.includes("podg.") && stopName.split(", podg.")[0] && stationName.includes(stopName.split(", podg.")[0])) return true;
-
+            // if (stationName)
             // if (station.stops && station.stops.includes(stop.stopNameRAW)) return true;
 
+            if (station.checkpoints.length > 0 && station.checkpoints.some(cp => cp.checkpointName.includes(stop.stopNameRAW))) return true;
+
             return false;
           });