diff --git a/src/components/JournalView/JournalStats.vue b/src/components/JournalView/JournalStats.vue
index ba33170..a5effe1 100644
--- a/src/components/JournalView/JournalStats.vue
+++ b/src/components/JournalView/JournalStats.vue
@@ -35,7 +35,8 @@ type TStatTab = 'daily' | 'driver';
 const store = useStore();
 const dailyStatsComp: Ref<InstanceType<typeof JournalDailyStats> | null> = ref(null);
 
-const areStatsOpen = ref(true);
+const lastDailyStatsOpen = ref(false);
+const areStatsOpen = ref(false);
 const lastClickedTab = ref('daily');
 
 let data = reactive({
@@ -54,9 +55,9 @@ let data = reactive({
 
 // Methods
 function onTabButtonClick(tab: TStatTab) {
-  if (lastClickedTab.value == tab || !areStatsOpen.value) {
-    areStatsOpen.value = !areStatsOpen.value;
-  }
+  if (lastClickedTab.value == tab || !areStatsOpen.value) areStatsOpen.value = !areStatsOpen.value;
+
+  if (tab == 'daily') lastDailyStatsOpen.value = areStatsOpen.value;
 
   store.currentStatsTab = tab;
   lastClickedTab.value = tab;
@@ -77,6 +78,7 @@ watch(
 
     lastClickedTab.value = statsData ? 'driver' : 'daily';
     if (statsData) areStatsOpen.value = true;
+    if (!statsData) areStatsOpen.value = lastDailyStatsOpen.value;
   }
 );
 </script>
diff --git a/src/views/JournalDispatchers.vue b/src/views/JournalDispatchers.vue
index c2a517d..56b28eb 100644
--- a/src/views/JournalDispatchers.vue
+++ b/src/views/JournalDispatchers.vue
@@ -19,7 +19,7 @@
               {{ $t('app.offline') }}
             </div>
 
-            <Loading v-else-if="dataStatus == DataStatus.Initialized || dataStatus == DataStatus.Loading" />
+            <Loading v-else-if="dataStatus == DataStatus.Loading" />
 
             <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
               {{ $t('app.error') }}
@@ -111,7 +111,7 @@ export default defineComponent({
     statsCardOpen: false,
     currentOptionsActive: false,
 
-    dataStatus: DataStatus.Initialized,
+    dataStatus: DataStatus.Loading,
     DataStatus,
 
     historyList: [] as DispatcherHistory[],
diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue
index bc5f61e..1f5e6ac 100644
--- a/src/views/JournalTimetables.vue
+++ b/src/views/JournalTimetables.vue
@@ -22,7 +22,7 @@
               {{ $t('app.offline') }}
             </div>
 
-            <Loading v-else-if="dataStatus == DataStatus.Initialized || dataStatus == DataStatus.Loading" />
+            <Loading v-else-if="dataStatus == DataStatus.Loading" />
 
             <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
               {{ $t('app.error') }}
@@ -105,7 +105,7 @@ export default defineComponent({
     timetableHistory: [] as TimetableHistory[],
     journalTimetableFilters,
 
-    dataStatus: DataStatus.Initialized,
+    dataStatus: DataStatus.Loading,
     dataErrorMessage: '',
 
     DataStatus,
@@ -215,7 +215,7 @@ export default defineComponent({
     },
 
     async fetchHistoryData() {
-      if(this.dataStatus == DataStatus.Loading) return;
+      // if(this.dataStatus == DataStatus.Loading) return;
 
       const queries: string[] = [];