diff --git a/src/components/Global/StationStatusBadge.vue b/src/components/Global/StationStatusBadge.vue
index fd35711..8e72403 100644
--- a/src/components/Global/StationStatusBadge.vue
+++ b/src/components/Global/StationStatusBadge.vue
@@ -1,7 +1,11 @@
 <template>
   <span class="status-badge" :class="statusName" v-if="isOnline">
     {{ $t(`status.${statusName}`) }}
-    {{ dispatcherStatus && dispatcherStatus > 5 ? timestampToString(dispatcherStatus) : '' }}
+    {{
+      statusName == 'online' && dispatcherStatus && dispatcherStatus > 5
+        ? timestampToString(dispatcherStatus)
+        : ''
+    }}
   </span>
 
   <span class="status-badge free" v-else>
@@ -52,6 +56,7 @@ export default defineComponent({
           return 'unknown';
 
         default:
+          if (this.dispatcherStatus >= Date.now() + 25500000) return 'no-limit';
           return 'online';
       }
     }
diff --git a/src/store/store.ts b/src/store/store.ts
index d912d69..61fd7dc 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -122,7 +122,7 @@ export const useStore = defineStore('store', {
       if (!state.apiData?.activeSceneries) return [];
 
       return state.apiData?.activeSceneries.reduce((list, scenery) => {
-        if (scenery.isOnline !== 1 && Date.now() - scenery.lastSeen > 1000 * 60 * 3) return list;
+        if (scenery.isOnline !== 1 && Date.now() - scenery.lastSeen > 1000 * 60 * 2) return list;
         if (scenery.dispatcherStatus == DispatcherStatus.UNKNOWN) return list;
 
         const station = this.stationList.find((s) => s.name === scenery.stationName);