diff --git a/FabApprovalWorkerService/Workers/ExpiredTECNWorker.cs b/FabApprovalWorkerService/Workers/ExpiredTECNWorker.cs
index e0cd5a6..b6029ca 100644
--- a/FabApprovalWorkerService/Workers/ExpiredTECNWorker.cs
+++ b/FabApprovalWorkerService/Workers/ExpiredTECNWorker.cs
@@ -82,8 +82,10 @@ public class ExpiredTECNWorker : IJob {
 
                 string subject = "Notice of Expired TECN";
 
+                DateTime latestExpirationDate = (ecn.ExtensionDate > ecn.ExpirationDate) ? ecn.ExtensionDate : ecn.ExpirationDate;
+
                 StringBuilder bodyBuilder = new();
-                bodyBuilder.Append($"Good day, TECN# {ecn.ECNNumber} expired on {ecn.ExpirationDate.ToString("MMMM dd, yyyy")}. ");
+                bodyBuilder.Append($"Good day, TECN# {ecn.ECNNumber} expired on {latestExpirationDate.ToString("MMMM dd, yyyy")}. ");
                 bodyBuilder.Append($"<br />Review TECN <a href='{_baseUrl}/ECN/Edit?IssueID={ecn.ECNNumber}'> here. </a>");
 
                 await _smtpService.SendEmail(recipientEamils, tecnNotificationUserEmails, subject, bodyBuilder.ToString());
diff --git a/FabApprovalWorkerService/Workers/ExpiringTECNWorker.cs b/FabApprovalWorkerService/Workers/ExpiringTECNWorker.cs
index cb99afb..4190bfa 100644
--- a/FabApprovalWorkerService/Workers/ExpiringTECNWorker.cs
+++ b/FabApprovalWorkerService/Workers/ExpiringTECNWorker.cs
@@ -64,9 +64,11 @@ public class ExpiringTECNWorker : IJob {
                     ccRecipientList.Add(new MailAddress(email));
                 }
 
+                DateTime latestExpirationDate = (eCN.ExtensionDate > eCN.ExpirationDate) ? eCN.ExtensionDate : eCN.ExpirationDate;
+
                 StringBuilder bodyBuilder = new();
                 bodyBuilder.Append($"Good day, TECN# {eCN.ECNNumber} will be expire on ");
-                bodyBuilder.Append($"{eCN.ExpirationDate.ToString("MMMM dd, yyyy")}. ");
+                bodyBuilder.Append($"{latestExpirationDate.ToString("MMMM dd, yyyy")}. ");
                 bodyBuilder.Append($"<br /> Review TECN <a href='{_baseUrl}/ECN/Edit?IssueID={eCN.ECNNumber}'> ");
                 bodyBuilder.Append("here </a>");