diff --git a/frontend/src/views/charts/AccountPie.vue b/frontend/src/views/charts/AccountPie.vue
index 66e20c3..5debcc9 100644
--- a/frontend/src/views/charts/AccountPie.vue
+++ b/frontend/src/views/charts/AccountPie.vue
@@ -186,7 +186,8 @@ export default {
           if (recordsDB.page.number == recordsDB.page.totalPages - 1) {
             hasNext = false;
           }
-        } else {
+        } 
+        if (this.status == 403) {
           hasNext = false;
         }
       };
diff --git a/frontend/src/views/charts/MonthSummary.vue b/frontend/src/views/charts/MonthSummary.vue
index c355db0..cfdbbd3 100644
--- a/frontend/src/views/charts/MonthSummary.vue
+++ b/frontend/src/views/charts/MonthSummary.vue
@@ -188,7 +188,8 @@ export default {
           if (recordsDB.page.number == recordsDB.page.totalPages - 1) {
             hasNext = false;
           }
-        } else {
+        } 
+        if (this.status == 403) {
           hasNext = false;
         }
       };
diff --git a/frontend/src/views/charts/RevenuePie.vue b/frontend/src/views/charts/RevenuePie.vue
index 69da257..dc12777 100644
--- a/frontend/src/views/charts/RevenuePie.vue
+++ b/frontend/src/views/charts/RevenuePie.vue
@@ -149,7 +149,8 @@ export default {
           if (recordsDB.page.number == recordsDB.page.totalPages - 1) {
             hasNext = false;
           }
-        } else {
+        } 
+        if (this.status == 403) {
           hasNext = false;
         }
       };
diff --git a/frontend/src/views/charts/WeekSummary.vue b/frontend/src/views/charts/WeekSummary.vue
index 43725f1..f2ed34d 100644
--- a/frontend/src/views/charts/WeekSummary.vue
+++ b/frontend/src/views/charts/WeekSummary.vue
@@ -189,9 +189,10 @@ export default {
           if (recordsDB.page.number == recordsDB.page.totalPages - 1) {
             hasNext = false;
           }
-      } else {
+      } 
+      if (this.status == 403) {
           hasNext = false;
-        }
+      }
     };
     xhttp.open(
       "GET",
@@ -201,7 +202,7 @@ export default {
         "T00:00:01" +
         "&end=" +
         today +
-        "T00:00:01" +
+        "T23:59:59" +
         "&username=" +
         sessionStorage.getItem("username") +
         "&page=" +
diff --git a/frontend/src/views/charts/WorkPausePie.vue b/frontend/src/views/charts/WorkPausePie.vue
index 8ee7b2a..b67ca9d 100644
--- a/frontend/src/views/charts/WorkPausePie.vue
+++ b/frontend/src/views/charts/WorkPausePie.vue
@@ -117,7 +117,8 @@ export default {
           if (recordsDB.page.number == recordsDB.page.totalPages - 1) {
             hasNext = false;
           }
-        } else {
+        } 
+        if (this.status == 403) {
           hasNext = false;
         }
       };