diff --git a/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java b/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java
index 96a48ce..879dd8f 100644
--- a/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java
+++ b/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java
@@ -44,13 +44,12 @@ public class PlanTimes {
             int year = startDate.get(IsoFields.WEEK_BASED_YEAR);
             String formattedStartWeek = String.format("%02d", startWeek);
 
+            LocalDate startOfWeek = startDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+            LocalDate endOfWeek = startDate.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
+
             calendarWeek.setWeek(year + "w" + formattedStartWeek);
             calendarWeek.setPlanTime(0);
-            calendarWeek.setStartDate(startDate.format(formatter));
-
-            LocalDate endOfWeek = startDate.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
-            if (endOfWeek.isAfter(endDate))
-                endOfWeek = endDate;
+            calendarWeek.setStartDate(startOfWeek.format(formatter));
             calendarWeek.setEndDate(endOfWeek.format(formatter));
 
             calenderWeeks.add(calendarWeek);
@@ -59,9 +58,7 @@ public class PlanTimes {
 
         var filter = req.getFilter();
         var qual = filter.constructQualifier(null, remedyJavaAPI);
-        var changesInDateRange = remedyJavaAPI.queryFieldsById(
-                qual,
-                queryChanges.getFieldIds(), formName, null, 0, 0);
+        var changesInDateRange = remedyJavaAPI.queryFieldsById(qual, queryChanges.getFieldIds(), formName, null, 0, 0);
 
         for (var week : calenderWeeks) {
             double planTimePerWeek = 0.0;