diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html
index 4c2738f6b..daef65998 100644
--- a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html
+++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html
@@ -148,7 +148,7 @@ <h4 *ngIf="condition.type">{{ stringIndex }}. {{ condition.type.label }}</h4>
       </ng-container>
 
       <ng-container matColumnDef="due">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header class="multiple-due">Due</th>
+        <th mat-header-cell *matHeaderCellDef class="multiple-due">Due</th>
         <td mat-cell *matCellDef="let element">
           <app-inline-datepicker
             [value]="condition.dates[element.index - 1].date ?? undefined"
@@ -158,7 +158,7 @@ <h4 *ngIf="condition.type">{{ stringIndex }}. {{ condition.type.label }}</h4>
       </ng-container>
 
       <ng-container matColumnDef="completed">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header class="multiple-completed">Completed</th>
+        <th mat-header-cell *matHeaderCellDef class="multiple-completed">Completed</th>
         <td mat-cell *matCellDef="let element">
           <app-inline-datepicker
             [value]="condition.dates[element.index - 1].completedDate ?? undefined"
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts
index e8d3aae35..a45a2eccb 100644
--- a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts
+++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts
@@ -112,7 +112,9 @@ export class ConditionComponent implements OnInit, AfterViewInit {
 
       this.loadLots();
       this.loadPlanNumber();
-      this.dataSource = new MatTableDataSource<ApplicationDecisionConditionDateWithIndex>(this.addIndex(this.dates));
+      this.dataSource = new MatTableDataSource<ApplicationDecisionConditionDateWithIndex>(
+        this.addIndex(this.sortDates(this.dates)),
+      );
     }
   }
 
@@ -251,9 +253,11 @@ export class ConditionComponent implements OnInit, AfterViewInit {
 
   sortDates(data: ApplicationDecisionConditionDateDto[]): ApplicationDecisionConditionDateDto[] {
     return data.sort((a, b) => {
-      const dateA = a.date || a.completedDate || new Date(0);
-      const dateB = b.date || b.completedDate || new Date(0);
-      return new Date(dateA).getTime() - new Date(dateB).getTime();
+      if (a.date == null && b.date == null) return 0;
+      if (a.date == null) return 1;
+      if (b.date == null) return -1;
+
+      return new Date(a.date).getTime() - new Date(b.date).getTime();
     });
   }
 
@@ -262,7 +266,9 @@ export class ConditionComponent implements OnInit, AfterViewInit {
 
     if (newDate) {
       this.dates.push(newDate);
-      this.dataSource = new MatTableDataSource<ApplicationDecisionConditionDateWithIndex>(this.addIndex(this.dates));
+      this.dataSource = new MatTableDataSource<ApplicationDecisionConditionDateWithIndex>(
+        this.addIndex(this.sortDates(this.dates)),
+      );
     }
   }
 
@@ -281,6 +287,9 @@ export class ConditionComponent implements OnInit, AfterViewInit {
 
       const response = await this.conditionService.updateDate(dateUuid, updatedDto);
       this.dates[index] = response;
+      this.dataSource = new MatTableDataSource<ApplicationDecisionConditionDateWithIndex>(
+        this.addIndex(this.sortDates(this.dates)),
+      );
     } else {
       console.error('Date with specified UUID not found');
     }
@@ -293,7 +302,9 @@ export class ConditionComponent implements OnInit, AfterViewInit {
 
       if (index !== -1) {
         this.dates.splice(index, 1);
-        this.dataSource = new MatTableDataSource<ApplicationDecisionConditionDateWithIndex>(this.addIndex(this.dates));
+        this.dataSource = new MatTableDataSource<ApplicationDecisionConditionDateWithIndex>(
+          this.addIndex(this.sortDates(this.dates)),
+        );
       }
     }
   }
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.html
index f5ba3f46a..18c4b0326 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.html
@@ -95,7 +95,7 @@ <h4 *ngIf="condition.type">{{ stringIndex }}. {{ condition.type.label }}</h4>
       </ng-container>
 
       <ng-container matColumnDef="due">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header class="multiple-due">Due</th>
+        <th mat-header-cell *matHeaderCellDef class="multiple-due">Due</th>
         <td mat-cell *matCellDef="let element">
           <app-inline-datepicker
             [value]="condition.dates[element.index - 1].date ?? undefined"
@@ -105,7 +105,7 @@ <h4 *ngIf="condition.type">{{ stringIndex }}. {{ condition.type.label }}</h4>
       </ng-container>
 
       <ng-container matColumnDef="completed">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header class="multiple-completed">Completed</th>
+        <th mat-header-cell *matHeaderCellDef class="multiple-completed">Completed</th>
         <td mat-cell *matCellDef="let element">
           <app-inline-datepicker
             [value]="condition.dates[element.index - 1].completedDate ?? undefined"
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts
index f2b000dd1..dc401865a 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts
+++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts
@@ -95,7 +95,9 @@ export class ConditionComponent implements OnInit, AfterViewInit {
       };
 
       this.isThreeColumn = this.showAdmFeeField && this.showSecurityAmountField;
-      this.dataSource = new MatTableDataSource<NoticeOfIntentDecisionConditionDateWithIndex>(this.addIndex(this.dates));
+      this.dataSource = new MatTableDataSource<NoticeOfIntentDecisionConditionDateWithIndex>(
+        this.addIndex(this.sortDates(this.dates)),
+      );
     }
   }
 
@@ -167,9 +169,11 @@ export class ConditionComponent implements OnInit, AfterViewInit {
 
   sortDates(data: NoticeOfIntentDecisionConditionDateDto[]): NoticeOfIntentDecisionConditionDateDto[] {
     return data.sort((a, b) => {
-      const dateA = a.date || a.completedDate || new Date(0);
-      const dateB = b.date || b.completedDate || new Date(0);
-      return new Date(dateA).getTime() - new Date(dateB).getTime();
+      if (a.date == null && b.date == null) return 0;
+      if (a.date == null) return 1;
+      if (b.date == null) return -1;
+
+      return new Date(a.date).getTime() - new Date(b.date).getTime();
     });
   }
 
@@ -178,7 +182,9 @@ export class ConditionComponent implements OnInit, AfterViewInit {
 
     if (newDate) {
       this.dates.push(newDate);
-      this.dataSource = new MatTableDataSource<NoticeOfIntentDecisionConditionDateWithIndex>(this.addIndex(this.dates));
+      this.dataSource = new MatTableDataSource<NoticeOfIntentDecisionConditionDateWithIndex>(
+        this.addIndex(this.sortDates(this.dates)),
+      );
     }
   }
 
@@ -197,6 +203,9 @@ export class ConditionComponent implements OnInit, AfterViewInit {
 
       const response = await this.conditionService.updateDate(dateUuid, updatedDto);
       this.dates[index] = response;
+      this.dataSource = new MatTableDataSource<NoticeOfIntentDecisionConditionDateWithIndex>(
+        this.addIndex(this.sortDates(this.dates)),
+      );
     } else {
       console.error('Date with specified UUID not found');
     }
@@ -210,7 +219,7 @@ export class ConditionComponent implements OnInit, AfterViewInit {
       if (index !== -1) {
         this.dates.splice(index, 1);
         this.dataSource = new MatTableDataSource<NoticeOfIntentDecisionConditionDateWithIndex>(
-          this.addIndex(this.dates),
+          this.addIndex(this.sortDates(this.dates)),
         );
       }
     }