diff --git a/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view-header/calendar-week-view-header.component.ts b/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view-header/calendar-week-view-header.component.ts
index 004ecd12a..113f2fe49 100644
--- a/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view-header/calendar-week-view-header.component.ts
+++ b/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view-header/calendar-week-view-header.component.ts
@@ -23,7 +23,7 @@ import { CalendarDatePipe } from '../../../common/calendar-date/calendar-date.pi
       let-dragEnter="dragEnter"
     >
       <div class="cal-day-headers" role="row">
-        @for (day of days; track day.date.toISOString()) {
+        @for (day of days; track $index) {
           <div
             class="cal-header"
             [class.cal-past]="day.isPast"
diff --git a/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view.component.spec.ts b/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view.component.spec.ts
index a475a18b9..ef3007b2c 100644
--- a/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view.component.spec.ts
+++ b/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view.component.spec.ts
@@ -3500,4 +3500,25 @@ describe('calendarWeekView component', () => {
       expect(eventDropped).to.have.been.calledOnce;
     });
   });
+
+  it('should not produce duplicate track keys when daysInWeek spans a DST transition', () => {
+    const fixture: ComponentFixture<CalendarWeekViewComponent> =
+      TestBed.createComponent(CalendarWeekViewComponent);
+    fixture.componentInstance.viewDate = new Date('2024-01-01');
+    fixture.componentInstance.daysInWeek = 140;
+    fixture.componentInstance.events = [];
+    fixture.componentInstance.ngOnChanges({
+      daysInWeek: {},
+      events: {},
+      viewDate: {},
+    });
+    fixture.detectChanges();
+    expect(
+      fixture.nativeElement.querySelectorAll('.cal-header').length,
+    ).to.equal(140);
+    expect(
+      fixture.nativeElement.querySelectorAll('.cal-time-events .cal-day-column')
+        .length,
+    ).to.equal(140);
+  });
 });
diff --git a/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view.component.ts b/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view.component.ts
index 35f76390a..fee96527c 100644
--- a/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view.component.ts
+++ b/projects/angular-calendar/src/modules/week/calendar-week-view/calendar-week-view.component.ts
@@ -112,7 +112,7 @@ export interface CalendarWeekViewBeforeRenderEvent extends WeekView {
             <div class="cal-time-label-column">
               <ng-container *ngTemplateOutlet="allDayEventsLabelTemplate" />
             </div>
-            @for (day of days; track day.date.toISOString()) {
+            @for (day of days; track $index) {
               <div
                 class="cal-day-column"
                 mwlDroppable
@@ -242,14 +242,11 @@ export interface CalendarWeekViewBeforeRenderEvent extends WeekView {
           <div class="cal-time-label-column">
             @for (
               hour of view.hourColumns[0].hours;
-              track hour.segments[0].date.toISOString();
+              track $index;
               let odd = $odd
             ) {
               <div class="cal-hour" [class.cal-hour-odd]="odd">
-                @for (
-                  segment of hour.segments;
-                  track segment.date.toISOString()
-                ) {
+                @for (segment of hour.segments; track $index) {
                   <mwl-calendar-week-view-hour-segment
                     [style.height.px]="hourSegmentHeight"
                     [segment]="segment"
@@ -269,12 +266,7 @@ export interface CalendarWeekViewBeforeRenderEvent extends WeekView {
           [class.cal-resize-active]="timeEventResizes.size > 0"
           #dayColumns
         >
-          @for (
-            column of view.hourColumns;
-            track column.hours[0]
-              ? column.hours[0].segments[0].date.toISOString()
-              : column
-          ) {
+          @for (column of view.hourColumns; track $index) {
             <div class="cal-day-column">
               <mwl-calendar-week-view-current-time-marker
                 [columnDate]="column.date"
@@ -409,16 +401,9 @@ export interface CalendarWeekViewBeforeRenderEvent extends WeekView {
                   </div>
                 }
               </div>
-              @for (
-                hour of column.hours;
-                track hour.segments[0].date.toISOString();
-                let odd = $odd
-              ) {
+              @for (hour of column.hours; track $index; let odd = $odd) {
                 <div class="cal-hour" [class.cal-hour-odd]="odd">
-                  @for (
-                    segment of hour.segments;
-                    track segment.date.toISOString()
-                  ) {
+                  @for (segment of hour.segments; track $index) {
                     <mwl-calendar-week-view-hour-segment
                       [style.height.px]="hourSegmentHeight"
                       [segment]="segment"