diff --git a/source/backend/api/Areas/Reports/Controllers/LeaseController.cs b/source/backend/api/Areas/Reports/Controllers/LeaseController.cs
index ca8468aa47..4fac74ce1e 100644
--- a/source/backend/api/Areas/Reports/Controllers/LeaseController.cs
+++ b/source/backend/api/Areas/Reports/Controllers/LeaseController.cs
@@ -19,6 +19,7 @@
 using Pims.Core.Extensions;
 using Pims.Dal.Entities;
 using Pims.Dal.Entities.Models;
+using Pims.Dal.Helpers.Extensions;
 using Pims.Dal.Repositories;
 using Pims.Dal.Security;
 using Swashbuckle.AspNetCore.Annotations;
@@ -204,9 +205,13 @@ public IActionResult ExportLeasePayments(int fiscalYearStart)
         public IEnumerable<LeaseModel> GetCrossJoinLeases(Lease.Models.Search.LeaseFilterModel filter, bool all = false)
         {
             var page = _leaseService.GetPage((LeaseFilter)filter, all);
-            var allLeases = page.Items.SelectMany(l => l.PimsLeasePeriods.DefaultIfEmpty(), (lease, period) => (lease, period))
+            var expiryDate = page.Items.Select(l => l.GetExpiryDate());
+
+            var allLeases = page.Items
+                .SelectMany(l => l.PimsLeasePeriods.DefaultIfEmpty(), (lease, period) => (lease, period))
                 .SelectMany(lt => lt.lease.PimsPropertyLeases.DefaultIfEmpty(), (leasePeriod, property) => (leasePeriod.period, leasePeriod.lease, property))
-                .SelectMany(ltp => ltp.lease.PimsLeaseTenants.DefaultIfEmpty(), (leasePeriodProperty, tenant) => (leasePeriodProperty.period, leasePeriodProperty.lease, leasePeriodProperty.property, tenant));
+                .SelectMany(ltp => ltp.lease.PimsLeaseTenants.DefaultIfEmpty(), (leasePeriodProperty, tenant) => (leasePeriodProperty.period, leasePeriodProperty.lease, leasePeriodProperty.property, tenant))
+                .SelectMany(ltpr => expiryDate, (leasePeriodPropertyTenant, expiryDate) => (leasePeriodPropertyTenant.period, leasePeriodPropertyTenant.lease, leasePeriodPropertyTenant.property, leasePeriodPropertyTenant.tenant, expiryDate));
             var flatLeases = _mapper.Map<IEnumerable<LeaseModel>>(allLeases);
             return flatLeases;
         }
diff --git a/source/backend/api/Areas/Reports/Mapping/Lease/LeaseMap.cs b/source/backend/api/Areas/Reports/Mapping/Lease/LeaseMap.cs
index fc429f2718..7c3f69122b 100644
--- a/source/backend/api/Areas/Reports/Mapping/Lease/LeaseMap.cs
+++ b/source/backend/api/Areas/Reports/Mapping/Lease/LeaseMap.cs
@@ -11,19 +11,19 @@ public class LeaseMap : IRegister
     {
         public void Register(TypeAdapterConfig config)
         {
-            config.NewConfig<(Entity.PimsLeasePeriod period, Entity.PimsLease lease, Entity.PimsPropertyLease property, Entity.PimsLeaseTenant tenant), Model.LeaseModel>()
+            config.NewConfig<(Entity.PimsLeasePeriod period, Entity.PimsLease lease, Entity.PimsPropertyLease property, Entity.PimsLeaseTenant tenant, DateTime? expiryDate), Model.LeaseModel>()
                 .AfterMapping((src, dest) =>
                 {
                     MapLease(src, dest);
                 });
         }
 
-        private static void MapLease((Entity.PimsLeasePeriod period, Entity.PimsLease lease, Entity.PimsPropertyLease property, Entity.PimsLeaseTenant tenant) src, Model.LeaseModel dest)
+        private static void MapLease((Entity.PimsLeasePeriod period, Entity.PimsLease lease, Entity.PimsPropertyLease property, Entity.PimsLeaseTenant tenant, DateTime? expiryDate) src, Model.LeaseModel dest)
         {
             dest.LFileNo = src.lease.LFileNo;
             dest.MotiRegion = src.lease.RegionCodeNavigation?.RegionName;
             dest.StartDate = src.lease.OrigStartDate.FilterSqlMinDate().ToNullableDateOnly();
-            dest.EndDate = src.lease.OrigExpiryDate?.FilterSqlMinDate().ToNullableDateOnly();
+            dest.EndDate = src.expiryDate.ToNullableDateOnly();
             dest.CurrentPeriodStartDate = src.lease.GetCurrentPeriodStartDate()?.FilterSqlMinDate().ToNullableDateOnly();
             dest.CurrentTermEndDate = src.lease.GetCurrentPeriodEndDate()?.FilterSqlMinDate().ToNullableDateOnly();
             dest.ProgramName = src.lease.LeaseProgramTypeCodeNavigation?.GetTypeDescriptionOther(src.lease.OtherLeaseProgramType);
@@ -36,7 +36,7 @@ private static void MapLease((Entity.PimsLeasePeriod period, Entity.PimsLease le
             dest.InspectionNotes = src.lease.InspectionNotes;
             dest.InspectionDate = src.lease.InspectionDate?.FilterSqlMinDate();
             dest.LeaseNotes = src.lease.LeaseNotes;
-            dest.IsExpired = (src.lease.GetExpiryDate() < DateTime.Now).BoolToYesNo();
+            dest.IsExpired = (src.expiryDate < DateTime.Now).BoolToYesNo();
             dest.LeaseAmount = src.period?.PaymentAmount;
             dest.PeriodStartDate = src.period?.PeriodStartDate.FilterSqlMinDate().ToNullableDateOnly();
             dest.PeriodExpiryDate = src.period?.PeriodExpiryDate?.FilterSqlMinDate().ToNullableDateOnly();
diff --git a/source/backend/dal/Repositories/LeaseRepository.cs b/source/backend/dal/Repositories/LeaseRepository.cs
index 149b28677d..f8a2c5bb75 100644
--- a/source/backend/dal/Repositories/LeaseRepository.cs
+++ b/source/backend/dal/Repositories/LeaseRepository.cs
@@ -895,7 +895,7 @@ public IQueryable<PimsLease> GenerateLeaseQuery(LeaseFilter filter, HashSet<shor
                             .ThenInclude(p => p.Address)
                         .Include(l => l.PimsPropertyLeases)
                             .ThenInclude(p => p.AreaUnitTypeCodeNavigation)
-                        .Include(pl => pl.PimsPropertyLeases)
+                        .Include(l => l.PimsPropertyLeases)
                             .ThenInclude(p => p.Property)
                             .ThenInclude(n => n.PimsHistoricalFileNumbers)
                             .ThenInclude(t => t.HistoricalFileNumberTypeCodeNavigation)
@@ -908,8 +908,9 @@ public IQueryable<PimsLease> GenerateLeaseQuery(LeaseFilter filter, HashSet<shor
                             .ThenInclude(t => t.Person)
                         .Include(l => l.PimsLeaseTenants)
                             .ThenInclude(t => t.Organization)
-                        .Include(p => p.RegionCodeNavigation)
+                        .Include(l => l.RegionCodeNavigation)
                         .Include(l => l.PimsLeasePeriods)
+                        .Include(l => l.PimsLeaseRenewals)
                         .AsNoTracking();
 
             if (loadPayments)
@@ -1100,17 +1101,25 @@ private static ExpressionStarter<PimsLease> GenerateCommonLeaseQuery(LeaseFilter
 
             var expiryStartDate = filter.ExpiryStartDate.ToNullableDateTime();
             var expiryEndDate = filter.ExpiryEndDate.ToNullableDateTime();
-            if (filter.ExpiryStartDate != null && filter.ExpiryEndDate != null)
+            if (expiryStartDate != null && expiryEndDate != null)
             {
-                predicateBuilder.And(l => l.OrigExpiryDate >= expiryStartDate && l.OrigExpiryDate <= expiryEndDate);
+                predicateBuilder = predicateBuilder.And(l => l.PimsLeaseRenewals.Where(r => r.IsExercised == true).Select(rf => rf.ExpiryDt).Max().HasValue ?
+                        l.PimsLeaseRenewals.Where(r => r.IsExercised == true).Select(rf => rf.ExpiryDt).Max() >= expiryStartDate &&
+                          l.PimsLeaseRenewals.Where(r => r.IsExercised == true).Select(rf => rf.ExpiryDt).Max() <= expiryEndDate :
+                        l.OrigExpiryDate >= expiryStartDate &&
+                          l.OrigExpiryDate <= expiryEndDate);
             }
-            else if (filter.ExpiryStartDate != null)
+            else if (expiryStartDate != null)
             {
-                predicateBuilder = predicateBuilder.And(l => l.OrigExpiryDate >= expiryStartDate);
+                predicateBuilder = predicateBuilder.And(l => l.PimsLeaseRenewals.Where(r => r.IsExercised == true).Select(rf => rf.ExpiryDt).Max().HasValue ?
+                        l.PimsLeaseRenewals.Where(r => r.IsExercised == true).Select(rf => rf.ExpiryDt).Max() >= expiryStartDate :
+                        l.OrigExpiryDate >= expiryStartDate);
             }
-            else if (filter.ExpiryEndDate != null)
+            else if (expiryEndDate != null)
             {
-                predicateBuilder = predicateBuilder.And(l => l.OrigExpiryDate <= expiryEndDate);
+                predicateBuilder = predicateBuilder.And(l => l.PimsLeaseRenewals.Where(r => r.IsExercised == true).Select(rf => rf.ExpiryDt).Max().HasValue ?
+                        l.PimsLeaseRenewals.Where(r => r.IsExercised == true).Select(rf => rf.ExpiryDt).Max() <= expiryEndDate :
+                        l.OrigExpiryDate <= expiryEndDate);
             }
 
             if (filter.RegionType.HasValue)
diff --git a/source/backend/dal/Repositories/PropertyLeaseRepository.cs b/source/backend/dal/Repositories/PropertyLeaseRepository.cs
index 9bf7971d11..3b939adb05 100644
--- a/source/backend/dal/Repositories/PropertyLeaseRepository.cs
+++ b/source/backend/dal/Repositories/PropertyLeaseRepository.cs
@@ -48,6 +48,8 @@ public IEnumerable<PimsPropertyLease> GetAllByPropertyId(long propertyId)
                     .ThenInclude(l => l.LeaseStatusTypeCodeNavigation)
                 .Include(pl => pl.Lease)
                     .ThenInclude(l => l.PimsLeasePeriods)
+                .Include(pl => pl.Lease)
+                    .ThenInclude(l => l.PimsLeaseRenewals)
                 .Where(p => p.PropertyId == propertyId);
         }
 
diff --git a/source/backend/entities/Extensions/LeaseExtensions.cs b/source/backend/entities/Extensions/LeaseExtensions.cs
index 214d5d59ff..dad2bb959b 100644
--- a/source/backend/entities/Extensions/LeaseExtensions.cs
+++ b/source/backend/entities/Extensions/LeaseExtensions.cs
@@ -66,19 +66,8 @@ public static string GetTenantName(this Pims.Dal.Entities.PimsLeaseTenant lease)
         /// <returns></returns>
         public static DateTime? GetExpiryDate(this Pims.Dal.Entities.PimsLease lease)
         {
-            if (lease.PimsLeasePeriods != null && lease.PimsLeasePeriods.Any(p => p.PeriodExpiryDate == null && !p.IsFlexibleDuration))
-            {
-                return null;
-            }
-            if (lease.OrigExpiryDate != null)
-            {
-                if (lease.PimsLeasePeriods != null && lease.PimsLeasePeriods.Any(p => p.PeriodExpiryDate > lease.OrigExpiryDate && !p.IsFlexibleDuration))
-                {
-                    return lease.PimsLeasePeriods.OrderByDescending(p => p.PeriodExpiryDate).FirstOrDefault().PeriodExpiryDate;
-                }
-                return lease.OrigExpiryDate;
-            }
-            return lease.PimsLeasePeriods?.OrderByDescending(p => p.PeriodExpiryDate).FirstOrDefault(p => !p.IsFlexibleDuration)?.PeriodExpiryDate;
+            var expiryDate = lease.PimsLeaseRenewals.Where(r => r.IsExercised == true).Select(fr => fr.ExpiryDt).Append(lease.OrigExpiryDate).Max();
+            return expiryDate;
         }
     }
 }
diff --git a/source/backend/tests/unit/dal/Core/Extensions/LeaseExtensionsTest.cs b/source/backend/tests/unit/dal/Core/Extensions/LeaseExtensionsTest.cs
index bbc6211034..3f69db2de8 100644
--- a/source/backend/tests/unit/dal/Core/Extensions/LeaseExtensionsTest.cs
+++ b/source/backend/tests/unit/dal/Core/Extensions/LeaseExtensionsTest.cs
@@ -30,18 +30,31 @@ public void GetExpiryDate_OrigExpiry()
         }
 
         [Fact]
-        public void GetExpiryDate_TermExpiry()
+        public void GetExpiryDate_RenewalExpiry()
         {
             DateTime now = DateTime.Now;
             PimsLease lease = new PimsLease()
             {
                 OrigExpiryDate = null,
-                PimsLeasePeriods = new List<PimsLeasePeriod>() {
-                new PimsLeasePeriod() { PeriodExpiryDate = now }, },
+                PimsLeaseRenewals = new List<PimsLeaseRenewal>() {
+                new PimsLeaseRenewal() { IsExercised = true, ExpiryDt = now }, },
             };
             Assert.Equal(now, lease.GetExpiryDate());
         }
 
+        [Fact]
+        public void GetExpiryDate_RenewalExpiry_NotExercised()
+        {
+            DateTime now = DateTime.Now;
+            PimsLease lease = new PimsLease()
+            {
+                OrigExpiryDate = null,
+                PimsLeaseRenewals = new List<PimsLeaseRenewal>() {
+                new PimsLeaseRenewal() { IsExercised = false, ExpiryDt = now }, },
+            };
+            Assert.Equal(null, lease.GetExpiryDate());
+        }
+
         [Fact]
         public void GetExpiryDate_OrigExpiryLater()
         {
@@ -50,28 +63,28 @@ public void GetExpiryDate_OrigExpiryLater()
             PimsLease lease = new PimsLease()
             {
                 OrigExpiryDate = later,
-                PimsLeasePeriods = new List<PimsLeasePeriod>() {
-                new PimsLeasePeriod() { PeriodExpiryDate = now }, },
+                PimsLeaseRenewals = new List<PimsLeaseRenewal>() {
+                new PimsLeaseRenewal() { IsExercised=true, ExpiryDt = now }, },
             };
             Assert.Equal(later, lease.GetExpiryDate());
         }
 
         [Fact]
-        public void GetExpiryDate_TermExpiryLater()
+        public void GetExpiryDate_RenewalExpiryLater()
         {
             DateTime now = DateTime.Now;
             DateTime later = now.AddDays(1);
             PimsLease lease = new PimsLease()
             {
                 OrigExpiryDate = now,
-                PimsLeasePeriods =
-                new List<PimsLeasePeriod>() { new PimsLeasePeriod() { PeriodExpiryDate = later } },
+                PimsLeaseRenewals =
+                new List<PimsLeaseRenewal>() { new PimsLeaseRenewal() { IsExercised = true, ExpiryDt = later } },
             };
             Assert.Equal(later, lease.GetExpiryDate());
         }
 
         [Fact]
-        public void GetExpiryDate_MultipleTermExpiryLater()
+        public void GetExpiryDate_MultipleRenewalExpiryLater()
         {
             DateTime now = DateTime.Now;
             DateTime later = now.AddDays(1);
@@ -79,15 +92,15 @@ public void GetExpiryDate_MultipleTermExpiryLater()
             PimsLease lease = new PimsLease()
             {
                 OrigExpiryDate = now,
-                PimsLeasePeriods =
-                new List<PimsLeasePeriod>() { new PimsLeasePeriod() { PeriodExpiryDate = later },
-                    new PimsLeasePeriod() { PeriodExpiryDate = before }, },
+                PimsLeaseRenewals =
+                new List<PimsLeaseRenewal>() { new PimsLeaseRenewal() { IsExercised=true, ExpiryDt = later },
+                    new PimsLeaseRenewal() { IsExercised=true, ExpiryDt = before }, },
             };
             Assert.Equal(later, lease.GetExpiryDate());
         }
 
         [Fact]
-        public void GetExpiryDate_TermNoExpiry()
+        public void GetExpiryDate_RenewalNoExpiry()
         {
             DateTime now = DateTime.Now;
             DateTime later = now.AddDays(1);
@@ -95,11 +108,11 @@ public void GetExpiryDate_TermNoExpiry()
             PimsLease lease = new PimsLease()
             {
                 OrigExpiryDate = now,
-                PimsLeasePeriods =
-                new List<PimsLeasePeriod>() { new PimsLeasePeriod() { PeriodExpiryDate = null },
-                    new PimsLeasePeriod() { PeriodExpiryDate = before }, },
+                PimsLeaseRenewals =
+                new List<PimsLeaseRenewal>() { new PimsLeaseRenewal() { IsExercised=true, ExpiryDt = null },
+                    new PimsLeaseRenewal() { IsExercised = false, ExpiryDt = before }, },
             };
-            Assert.Equal(null, lease.GetExpiryDate());
+            Assert.Equal(now, lease.GetExpiryDate());
         }
         #endregion
     }
diff --git a/source/frontend/src/features/leases/leaseUtils.ts b/source/frontend/src/features/leases/leaseUtils.ts
index 06f0ee4011..a7805e98d1 100644
--- a/source/frontend/src/features/leases/leaseUtils.ts
+++ b/source/frontend/src/features/leases/leaseUtils.ts
@@ -1,3 +1,7 @@
+import moment from 'moment';
+
+import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease';
+import { ApiGen_Concepts_LeaseRenewal } from '@/models/api/generated/ApiGen_Concepts_LeaseRenewal';
 import { ApiGen_Concepts_LeaseTenant } from '@/models/api/generated/ApiGen_Concepts_LeaseTenant';
 import { isValidId } from '@/utils';
 import { formatNames } from '@/utils/personUtils';
@@ -16,6 +20,21 @@ export const getAllNames = (tenants: ApiGen_Concepts_LeaseTenant[]): string[] =>
   return allNames;
 };
 
+export const getCalculatedExpiry = (
+  lease: ApiGen_Concepts_Lease,
+  renewals: ApiGen_Concepts_LeaseRenewal[],
+): string => {
+  const excercisedRenewalDates = renewals.filter(r => r.isExercised).flatMap(fr => fr.expiryDt);
+
+  let calculatedExpiry: string | null = lease?.expiryDate ?? '';
+  for (let i = 0; i < excercisedRenewalDates.length; i++) {
+    if (moment(excercisedRenewalDates[i]).isAfter(calculatedExpiry)) {
+      calculatedExpiry = excercisedRenewalDates[i];
+    }
+  }
+  return calculatedExpiry;
+};
+
 export const getSuggestedFee = (isPublicBenefit: boolean, isFinancialGain: boolean): string => {
   if (isPublicBenefit == null || isFinancialGain == null) return 'Unknown';
   else if (isPublicBenefit && isFinancialGain) return 'Licence Administration Fee (LAF) *';
diff --git a/source/frontend/src/features/leases/list/LeaseFilter/LeaseFilter.tsx b/source/frontend/src/features/leases/list/LeaseFilter/LeaseFilter.tsx
index 787b609dd4..9312286e49 100644
--- a/source/frontend/src/features/leases/list/LeaseFilter/LeaseFilter.tsx
+++ b/source/frontend/src/features/leases/list/LeaseFilter/LeaseFilter.tsx
@@ -9,6 +9,7 @@ import { ResetButton, SearchButton } from '@/components/common/buttons';
 import { FastDatePicker, Input } from '@/components/common/form';
 import { UserRegionSelectContainer } from '@/components/common/form/UserRegionSelect/UserRegionSelectContainer';
 import { SelectInput } from '@/components/common/List/SelectInput';
+import { SectionField } from '@/components/common/Section/SectionField';
 import { FilterBoxForm } from '@/components/common/styles';
 import TooltipIcon from '@/components/common/TooltipIcon';
 import { LEASE_PROGRAM_TYPES, LEASE_STATUS_TYPES } from '@/constants/API';
@@ -107,9 +108,9 @@ export const LeaseFilter: React.FunctionComponent<React.PropsWithChildren<ILease
       {formikProps => (
         <FilterBoxForm className="p-3">
           <Row>
-            <Col xl="6">
+            <Col xs="6">
               <Row>
-                <Col xl="auto">
+                <Col xs="auto">
                   <strong>Search by:</strong>
                 </Col>
                 <Col>
@@ -206,48 +207,45 @@ export const LeaseFilter: React.FunctionComponent<React.PropsWithChildren<ILease
                 </Col>
               </Row>
             </Col>
-            <Col xl="5">
-              <Row>
-                <Col xl="auto">
-                  <strong>Expiry date:</strong>
-                </Col>
-                <Col>
-                  <Row>
-                    <Col>
-                      <FastDatePicker
-                        field="expiryStartDate"
-                        formikProps={formikProps}
-                        placeholderText="from date"
-                      />
-                    </Col>
-                    <Col>
-                      <FastDatePicker
-                        field="expiryEndDate"
-                        formikProps={formikProps}
-                        placeholderText="to date"
-                      />
-                    </Col>
-                  </Row>
-                  <Row>
-                    <Col>
-                      <UserRegionSelectContainer field="regionType" placeholder="All Regions" />
-                    </Col>
-                    <Col>
-                      <Row>
-                        <Col xs="10" className="pr-0 mr-0">
-                          <Input field="details" placeholder="Keyword" />
-                        </Col>
-                        <Col xs="1" className="pl-0 ml-0">
-                          <TooltipIcon
-                            toolTipId="lease-search-keyword-tooltip"
-                            toolTip="Search 'Lease description' and 'Notes' fields"
-                          />
-                        </Col>
-                      </Row>
-                    </Col>
-                  </Row>
-                </Col>
-              </Row>
+            <Col xs="5">
+              <SectionField label="Expiry date" labelWidth="2">
+                <Row>
+                  <Col>
+                    <FastDatePicker
+                      field="expiryStartDate"
+                      formikProps={formikProps}
+                      placeholderText="from date"
+                    />
+                  </Col>
+                  <Col>
+                    <FastDatePicker
+                      field="expiryEndDate"
+                      formikProps={formikProps}
+                      placeholderText="to date"
+                    />
+                  </Col>
+                </Row>
+              </SectionField>
+              <SectionField label="" labelWidth="2">
+                <Row>
+                  <Col>
+                    <UserRegionSelectContainer field="regionType" placeholder="All Regions" />
+                  </Col>
+                  <Col>
+                    <Row noGutters>
+                      <Col xs="9">
+                        <Input field="details" placeholder="Keyword" />
+                      </Col>
+                      <Col xs="1">
+                        <TooltipIcon
+                          toolTipId="lease-search-keyword-tooltip"
+                          toolTip="Search 'Lease description' and 'Notes' fields"
+                        />
+                      </Col>
+                    </Row>
+                  </Col>
+                </Row>
+              </SectionField>
             </Col>
             <ColButtons xl="1">
               <Row>
diff --git a/source/frontend/src/features/leases/list/LeaseFilter/__snapshots__/LeaseFilter.test.tsx.snap b/source/frontend/src/features/leases/list/LeaseFilter/__snapshots__/LeaseFilter.test.tsx.snap
index 063e447e4c..06004a019f 100644
--- a/source/frontend/src/features/leases/list/LeaseFilter/__snapshots__/LeaseFilter.test.tsx.snap
+++ b/source/frontend/src/features/leases/list/LeaseFilter/__snapshots__/LeaseFilter.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Lease Filter > matches snapshot 1`] = `
     class="Toastify"
   />
   <div />
-  .c6.btn {
+  .c8.btn {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -37,55 +37,55 @@ exports[`Lease Filter > matches snapshot 1`] = `
   height: 3.8rem;
 }
 
-.c6.btn .Button__value {
+.c8.btn .Button__value {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
 }
 
-.c6.btn:hover {
+.c8.btn:hover {
   -webkit-text-decoration: underline;
   text-decoration: underline;
   opacity: 0.8;
 }
 
-.c6.btn:focus {
+.c8.btn:focus {
   outline-width: 0.4rem;
   outline-style: solid;
   outline-offset: 1px;
   box-shadow: none;
 }
 
-.c6.btn.btn-primary {
+.c8.btn.btn-primary {
   border: none;
 }
 
-.c6.btn.btn-secondary {
+.c8.btn.btn-secondary {
   background: none;
 }
 
-.c6.btn.btn-info {
+.c8.btn.btn-info {
   border: none;
   background: none;
   padding-left: 0.6rem;
   padding-right: 0.6rem;
 }
 
-.c6.btn.btn-info:hover,
-.c6.btn.btn-info:active,
-.c6.btn.btn-info:focus {
+.c8.btn.btn-info:hover,
+.c8.btn.btn-info:active,
+.c8.btn.btn-info:focus {
   background: none;
 }
 
-.c6.btn.btn-light {
+.c8.btn.btn-light {
   border: none;
 }
 
-.c6.btn.btn-dark {
+.c8.btn.btn-dark {
   border: none;
 }
 
-.c6.btn.btn-link {
+.c8.btn.btn-link {
   font-size: 1.6rem;
   font-weight: 400;
   background: none;
@@ -106,9 +106,9 @@ exports[`Lease Filter > matches snapshot 1`] = `
   padding: 0;
 }
 
-.c6.btn.btn-link:hover,
-.c6.btn.btn-link:active,
-.c6.btn.btn-link:focus {
+.c8.btn.btn-link:hover,
+.c8.btn.btn-link:active,
+.c8.btn.btn-link:focus {
   -webkit-text-decoration: underline;
   text-decoration: underline;
   border: none;
@@ -117,14 +117,14 @@ exports[`Lease Filter > matches snapshot 1`] = `
   outline: none;
 }
 
-.c6.btn.btn-link:disabled,
-.c6.btn.btn-link.disabled {
+.c8.btn.btn-link:disabled,
+.c8.btn.btn-link.disabled {
   background: none;
   pointer-events: none;
 }
 
-.c6.btn:disabled,
-.c6.btn:disabled:hover {
+.c8.btn:disabled,
+.c8.btn:disabled:hover {
   box-shadow: none;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -135,19 +135,19 @@ exports[`Lease Filter > matches snapshot 1`] = `
   opacity: 0.65;
 }
 
-.c6.Button .Button__icon {
+.c8.Button .Button__icon {
   margin-right: 1.6rem;
 }
 
-.c6.Button--icon-only:focus {
+.c8.Button--icon-only:focus {
   outline: none;
 }
 
-.c6.Button--icon-only .Button__icon {
+.c8.Button--icon-only .Button__icon {
   margin-right: 0;
 }
 
-.c3 .react-datepicker__calendar-icon {
+.c5 .react-datepicker__calendar-icon {
   width: 2.4rem;
   height: 3rem;
   margin-top: 0.5rem;
@@ -156,19 +156,19 @@ exports[`Lease Filter > matches snapshot 1`] = `
   pointer-events: none;
 }
 
-.c3 .react-datepicker__view-calendar-icon input {
+.c5 .react-datepicker__view-calendar-icon input {
   padding: 0.8rem 1.2rem 0.8rem 1.2rem;
 }
 
-.c3 .react-datepicker-wrapper {
+.c5 .react-datepicker-wrapper {
   max-width: 17rem;
 }
 
-.c4.c4.form-control.is-valid {
+.c6.c6.form-control.is-valid {
   background-image: none;
 }
 
-.c4.c4.form-control.is-invalid {
+.c6.c6.form-control.is-invalid {
   border-color: #d8292f !important;
 }
 
@@ -194,7 +194,19 @@ exports[`Lease Filter > matches snapshot 1`] = `
   border-radius: 0.5rem;
 }
 
-.c5 {
+.c4.required::before {
+  content: '*';
+  position: absolute;
+  top: 0.75rem;
+  left: 0rem;
+}
+
+.c3 {
+  font-weight: bold;
+  white-space: nowrap;
+}
+
+.c7 {
   border-left: 2px solid white;
 }
 
@@ -206,13 +218,13 @@ exports[`Lease Filter > matches snapshot 1`] = `
       class="row"
     >
       <div
-        class="col-xl-6"
+        class="col-6"
       >
         <div
           class="row"
         >
           <div
-            class="col-xl-auto"
+            class="col-auto"
           >
             <strong>
               Search by:
@@ -421,20 +433,22 @@ exports[`Lease Filter > matches snapshot 1`] = `
         </div>
       </div>
       <div
-        class="col-xl-5"
+        class="col-5"
       >
         <div
-          class="row"
+          class="pb-2 row"
         >
           <div
-            class="col-xl-auto"
+            class="pr-0 text-left col-2"
           >
-            <strong>
+            <label
+              class="c3"
+            >
               Expiry date:
-            </strong>
+            </label>
           </div>
           <div
-            class="col"
+            class="c4 text-left col"
           >
             <div
               class="row"
@@ -443,7 +457,7 @@ exports[`Lease Filter > matches snapshot 1`] = `
                 class="col"
               >
                 <div
-                  class="c3 form-group"
+                  class="c5 form-group"
                 >
                   <div
                     class="react-datepicker-wrapper d-block"
@@ -462,7 +476,7 @@ exports[`Lease Filter > matches snapshot 1`] = `
                       </svg>
                       <input
                         autocomplete="off"
-                        class="c4 form-control date-picker"
+                        class="c6 form-control date-picker"
                         id="datepicker-expiryStartDate"
                         name="expiryStartDate"
                         placeholder="from date"
@@ -477,7 +491,7 @@ exports[`Lease Filter > matches snapshot 1`] = `
                 class="col"
               >
                 <div
-                  class="c3 form-group"
+                  class="c5 form-group"
                 >
                   <div
                     class="react-datepicker-wrapper d-block"
@@ -496,7 +510,7 @@ exports[`Lease Filter > matches snapshot 1`] = `
                       </svg>
                       <input
                         autocomplete="off"
-                        class="c4 form-control date-picker"
+                        class="c6 form-control date-picker"
                         id="datepicker-expiryEndDate"
                         name="expiryEndDate"
                         placeholder="to date"
@@ -508,6 +522,17 @@ exports[`Lease Filter > matches snapshot 1`] = `
                 </div>
               </div>
             </div>
+          </div>
+        </div>
+        <div
+          class="pb-2 row"
+        >
+          <div
+            class="pr-0 text-left col-2"
+          />
+          <div
+            class="c4 text-left col"
+          >
             <div
               class="row"
             >
@@ -554,10 +579,10 @@ exports[`Lease Filter > matches snapshot 1`] = `
                 class="col"
               >
                 <div
-                  class="row"
+                  class="row no-gutters"
                 >
                   <div
-                    class="pr-0 mr-0 col-10"
+                    class="col-9"
                   >
                     <div
                       class="input form-group"
@@ -573,7 +598,7 @@ exports[`Lease Filter > matches snapshot 1`] = `
                     </div>
                   </div>
                   <div
-                    class="pl-0 ml-0 col-1"
+                    class="col-1"
                   >
                     <span
                       class="tooltip-icon"
@@ -603,7 +628,7 @@ exports[`Lease Filter > matches snapshot 1`] = `
         </div>
       </div>
       <div
-        class="c5 col-xl-1"
+        class="c7 col-xl-1"
       >
         <div
           class="row"
@@ -612,7 +637,7 @@ exports[`Lease Filter > matches snapshot 1`] = `
             class="pr-0 col-auto"
           >
             <button
-              class="c6 Button Button--icon-only primary btn btn-primary"
+              class="c8 Button Button--icon-only primary btn btn-primary"
               data-testid="search"
               id="search-button"
               title="search"
@@ -641,7 +666,7 @@ exports[`Lease Filter > matches snapshot 1`] = `
             class="col-auto"
           >
             <button
-              class="c6 Button Button--icon-only btn btn-info"
+              class="c8 Button Button--icon-only btn btn-info"
               data-testid="reset-button"
               id="reset-button"
               title="reset-button"
diff --git a/source/frontend/src/features/leases/list/LeaseSearchResults/LeaseSearchResults.tsx b/source/frontend/src/features/leases/list/LeaseSearchResults/LeaseSearchResults.tsx
index 57bb53c78c..be2b3b1c21 100644
--- a/source/frontend/src/features/leases/list/LeaseSearchResults/LeaseSearchResults.tsx
+++ b/source/frontend/src/features/leases/list/LeaseSearchResults/LeaseSearchResults.tsx
@@ -14,6 +14,7 @@ import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Le
 import { exists, prettyFormatDate } from '@/utils';
 import { formatApiPersonNames } from '@/utils/personUtils';
 
+import { getCalculatedExpiry } from '../../leaseUtils';
 import LeaseProperties from './LeaseProperties';
 import LeaseTenants from './LeaseTenants';
 
@@ -41,7 +42,10 @@ const columns: ColumnWithProps<ApiGen_Concepts_Lease>[] = [
     sortable: true,
     width: 20,
     Cell: (props: CellProps<ApiGen_Concepts_Lease>) => {
-      const expiryDate = props.row.original.expiryDate;
+      const expiryDate = getCalculatedExpiry(
+        props.row.original,
+        props.row.original?.renewals ?? [],
+      );
       const isExpired = moment().isAfter(moment(expiryDate, 'YYYY-MM-DD'), 'day');
 
       const icon = (
diff --git a/source/frontend/src/features/leases/list/__snapshots__/LeaseListView.test.tsx.snap b/source/frontend/src/features/leases/list/__snapshots__/LeaseListView.test.tsx.snap
index 52bcc3d959..04cb537125 100644
--- a/source/frontend/src/features/leases/list/__snapshots__/LeaseListView.test.tsx.snap
+++ b/source/frontend/src/features/leases/list/__snapshots__/LeaseListView.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
     class="Toastify"
   />
   <div />
-  .c11.btn {
+  .c13.btn {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -37,55 +37,55 @@ exports[`Lease and License List View > matches snapshot 1`] = `
   height: 3.8rem;
 }
 
-.c11.btn .Button__value {
+.c13.btn .Button__value {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
 }
 
-.c11.btn:hover {
+.c13.btn:hover {
   -webkit-text-decoration: underline;
   text-decoration: underline;
   opacity: 0.8;
 }
 
-.c11.btn:focus {
+.c13.btn:focus {
   outline-width: 0.4rem;
   outline-style: solid;
   outline-offset: 1px;
   box-shadow: none;
 }
 
-.c11.btn.btn-primary {
+.c13.btn.btn-primary {
   border: none;
 }
 
-.c11.btn.btn-secondary {
+.c13.btn.btn-secondary {
   background: none;
 }
 
-.c11.btn.btn-info {
+.c13.btn.btn-info {
   border: none;
   background: none;
   padding-left: 0.6rem;
   padding-right: 0.6rem;
 }
 
-.c11.btn.btn-info:hover,
-.c11.btn.btn-info:active,
-.c11.btn.btn-info:focus {
+.c13.btn.btn-info:hover,
+.c13.btn.btn-info:active,
+.c13.btn.btn-info:focus {
   background: none;
 }
 
-.c11.btn.btn-light {
+.c13.btn.btn-light {
   border: none;
 }
 
-.c11.btn.btn-dark {
+.c13.btn.btn-dark {
   border: none;
 }
 
-.c11.btn.btn-link {
+.c13.btn.btn-link {
   font-size: 1.6rem;
   font-weight: 400;
   background: none;
@@ -106,9 +106,9 @@ exports[`Lease and License List View > matches snapshot 1`] = `
   padding: 0;
 }
 
-.c11.btn.btn-link:hover,
-.c11.btn.btn-link:active,
-.c11.btn.btn-link:focus {
+.c13.btn.btn-link:hover,
+.c13.btn.btn-link:active,
+.c13.btn.btn-link:focus {
   -webkit-text-decoration: underline;
   text-decoration: underline;
   border: none;
@@ -117,14 +117,14 @@ exports[`Lease and License List View > matches snapshot 1`] = `
   outline: none;
 }
 
-.c11.btn.btn-link:disabled,
-.c11.btn.btn-link.disabled {
+.c13.btn.btn-link:disabled,
+.c13.btn.btn-link.disabled {
   background: none;
   pointer-events: none;
 }
 
-.c11.btn:disabled,
-.c11.btn:disabled:hover {
+.c13.btn:disabled,
+.c13.btn:disabled:hover {
   box-shadow: none;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -135,42 +135,42 @@ exports[`Lease and License List View > matches snapshot 1`] = `
   opacity: 0.65;
 }
 
-.c11.Button .Button__icon {
+.c13.Button .Button__icon {
   margin-right: 1.6rem;
 }
 
-.c11.Button--icon-only:focus {
+.c13.Button--icon-only:focus {
   outline: none;
 }
 
-.c11.Button--icon-only .Button__icon {
+.c13.Button--icon-only .Button__icon {
   margin-right: 0;
 }
 
-.c12.c12.btn {
+.c14.c14.btn {
   background-color: unset;
   border: none;
 }
 
-.c12.c12.btn:hover,
-.c12.c12.btn:focus,
-.c12.c12.btn:active {
+.c14.c14.btn:hover,
+.c14.c14.btn:focus,
+.c14.c14.btn:active {
   background-color: unset;
   outline: none;
   box-shadow: none;
 }
 
-.c12.c12.btn svg {
+.c14.c14.btn svg {
   -webkit-transition: all 0.3s ease-out;
   transition: all 0.3s ease-out;
 }
 
-.c12.c12.btn svg:hover {
+.c14.c14.btn svg:hover {
   -webkit-transition: all 0.3s ease-in;
   transition: all 0.3s ease-in;
 }
 
-.c8 .react-datepicker__calendar-icon {
+.c10 .react-datepicker__calendar-icon {
   width: 2.4rem;
   height: 3rem;
   margin-top: 0.5rem;
@@ -179,19 +179,19 @@ exports[`Lease and License List View > matches snapshot 1`] = `
   pointer-events: none;
 }
 
-.c8 .react-datepicker__view-calendar-icon input {
+.c10 .react-datepicker__view-calendar-icon input {
   padding: 0.8rem 1.2rem 0.8rem 1.2rem;
 }
 
-.c8 .react-datepicker-wrapper {
+.c10 .react-datepicker-wrapper {
   max-width: 17rem;
 }
 
-.c9.c9.form-control.is-valid {
+.c11.c11.form-control.is-valid {
   background-image: none;
 }
 
-.c9.c9.form-control.is-invalid {
+.c11.c11.form-control.is-invalid {
   border-color: #d8292f !important;
 }
 
@@ -213,7 +213,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
   border-bottom-left-radius: 0;
 }
 
-.c13 {
+.c15 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -232,12 +232,12 @@ exports[`Lease and License List View > matches snapshot 1`] = `
   margin-left: 0.5rem;
 }
 
-.c15 {
+.c17 {
   width: 1.6rem;
   height: 1.6rem;
 }
 
-.c14 {
+.c16 {
   width: 1.6rem;
   height: 1.6rem;
 }
@@ -246,7 +246,19 @@ exports[`Lease and License List View > matches snapshot 1`] = `
   border-radius: 0.5rem;
 }
 
-.c10 {
+.c9.required::before {
+  content: '*';
+  position: absolute;
+  top: 0.75rem;
+  left: 0rem;
+}
+
+.c8 {
+  font-weight: bold;
+  white-space: nowrap;
+}
+
+.c12 {
   border-left: 2px solid white;
 }
 
@@ -322,13 +334,13 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                 class="row"
               >
                 <div
-                  class="col-xl-6"
+                  class="col-6"
                 >
                   <div
                     class="row"
                   >
                     <div
-                      class="col-xl-auto"
+                      class="col-auto"
                     >
                       <strong>
                         Search by:
@@ -537,20 +549,22 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xl-5"
+                  class="col-5"
                 >
                   <div
-                    class="row"
+                    class="pb-2 row"
                   >
                     <div
-                      class="col-xl-auto"
+                      class="pr-0 text-left col-2"
                     >
-                      <strong>
+                      <label
+                        class="c8"
+                      >
                         Expiry date:
-                      </strong>
+                      </label>
                     </div>
                     <div
-                      class="col"
+                      class="c9 text-left col"
                     >
                       <div
                         class="row"
@@ -559,7 +573,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                           class="col"
                         >
                           <div
-                            class="c8 form-group"
+                            class="c10 form-group"
                           >
                             <div
                               class="react-datepicker-wrapper d-block"
@@ -578,7 +592,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                                 </svg>
                                 <input
                                   autocomplete="off"
-                                  class="c9 form-control date-picker"
+                                  class="c11 form-control date-picker"
                                   id="datepicker-expiryStartDate"
                                   name="expiryStartDate"
                                   placeholder="from date"
@@ -593,7 +607,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                           class="col"
                         >
                           <div
-                            class="c8 form-group"
+                            class="c10 form-group"
                           >
                             <div
                               class="react-datepicker-wrapper d-block"
@@ -612,7 +626,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                                 </svg>
                                 <input
                                   autocomplete="off"
-                                  class="c9 form-control date-picker"
+                                  class="c11 form-control date-picker"
                                   id="datepicker-expiryEndDate"
                                   name="expiryEndDate"
                                   placeholder="to date"
@@ -624,6 +638,17 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                           </div>
                         </div>
                       </div>
+                    </div>
+                  </div>
+                  <div
+                    class="pb-2 row"
+                  >
+                    <div
+                      class="pr-0 text-left col-2"
+                    />
+                    <div
+                      class="c9 text-left col"
+                    >
                       <div
                         class="row"
                       >
@@ -670,10 +695,10 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                           class="col"
                         >
                           <div
-                            class="row"
+                            class="row no-gutters"
                           >
                             <div
-                              class="pr-0 mr-0 col-10"
+                              class="col-9"
                             >
                               <div
                                 class="input form-group"
@@ -689,7 +714,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                               </div>
                             </div>
                             <div
-                              class="pl-0 ml-0 col-1"
+                              class="col-1"
                             >
                               <span
                                 class="tooltip-icon"
@@ -719,7 +744,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                   </div>
                 </div>
                 <div
-                  class="c10 col-xl-1"
+                  class="c12 col-xl-1"
                 >
                   <div
                     class="row"
@@ -728,7 +753,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                       class="pr-0 col-auto"
                     >
                       <button
-                        class="c11 Button Button--icon-only primary btn btn-primary"
+                        class="c13 Button Button--icon-only primary btn btn-primary"
                         data-testid="search"
                         id="search-button"
                         title="search"
@@ -757,7 +782,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                       class="col-auto"
                     >
                       <button
-                        class="c11 Button Button--icon-only btn btn-info"
+                        class="c13 Button Button--icon-only btn btn-info"
                         data-testid="reset-button"
                         id="reset-button"
                         title="reset-button"
@@ -791,7 +816,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
             class="px-0 col-md-auto"
           >
             <button
-              class="c11 Button c12 btn btn-primary"
+              class="c13 Button c14 btn btn-primary"
               type="button"
             >
               <div
@@ -818,7 +843,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
             class="px-0 col-md-auto"
           >
             <button
-              class="c11 Button c12 btn btn-primary"
+              class="c13 Button c14 btn btn-primary"
               type="button"
             >
               <div
@@ -867,11 +892,11 @@ exports[`Lease and License List View > matches snapshot 1`] = `
               >
                 L-File Number
                 <div
-                  class="c13"
+                  class="c15"
                   data-testid="sort-column-lFileNo"
                 >
                   <svg
-                    class="c14"
+                    class="c16"
                     fill="currentColor"
                     height="1em"
                     stroke="currentColor"
@@ -886,7 +911,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                     />
                   </svg>
                   <svg
-                    class="c15"
+                    class="c17"
                     fill="currentColor"
                     height="1em"
                     stroke="currentColor"
@@ -913,11 +938,11 @@ exports[`Lease and License List View > matches snapshot 1`] = `
               >
                 Expiry Date
                 <div
-                  class="c13"
+                  class="c15"
                   data-testid="sort-column-expiryDate"
                 >
                   <svg
-                    class="c14"
+                    class="c16"
                     fill="currentColor"
                     height="1em"
                     stroke="currentColor"
@@ -932,7 +957,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                     />
                   </svg>
                   <svg
-                    class="c15"
+                    class="c17"
                     fill="currentColor"
                     height="1em"
                     stroke="currentColor"
@@ -959,11 +984,11 @@ exports[`Lease and License List View > matches snapshot 1`] = `
               >
                 Program Name
                 <div
-                  class="c13"
+                  class="c15"
                   data-testid="sort-column-programName"
                 >
                   <svg
-                    class="c14"
+                    class="c16"
                     fill="currentColor"
                     height="1em"
                     stroke="currentColor"
@@ -978,7 +1003,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                     />
                   </svg>
                   <svg
-                    class="c15"
+                    class="c17"
                     fill="currentColor"
                     height="1em"
                     stroke="currentColor"
@@ -1041,11 +1066,11 @@ exports[`Lease and License List View > matches snapshot 1`] = `
               >
                 Status
                 <div
-                  class="c13"
+                  class="c15"
                   data-testid="sort-column-fileStatusTypeCode"
                 >
                   <svg
-                    class="c14"
+                    class="c16"
                     fill="currentColor"
                     height="1em"
                     stroke="currentColor"
@@ -1060,7 +1085,7 @@ exports[`Lease and License List View > matches snapshot 1`] = `
                     />
                   </svg>
                   <svg
-                    class="c15"
+                    class="c17"
                     fill="currentColor"
                     height="1em"
                     stroke="currentColor"
diff --git a/source/frontend/src/features/mapSideBar/acquisition/common/GenerateForm/hooks/useGenerateLicenceOfOccupation.ts b/source/frontend/src/features/mapSideBar/acquisition/common/GenerateForm/hooks/useGenerateLicenceOfOccupation.ts
index 31b28ad01a..1c19ef5756 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/common/GenerateForm/hooks/useGenerateLicenceOfOccupation.ts
+++ b/source/frontend/src/features/mapSideBar/acquisition/common/GenerateForm/hooks/useGenerateLicenceOfOccupation.ts
@@ -3,6 +3,7 @@ import { useDocumentGenerationRepository } from '@/features/documents/hooks/useD
 import { useApiLeases } from '@/hooks/pims-api/useApiLeases';
 import { useInsurancesRepository } from '@/hooks/repositories/useInsuranceRepository';
 import { useLeasePeriodRepository } from '@/hooks/repositories/useLeasePeriodRepository';
+import { useLeaseRepository } from '@/hooks/repositories/useLeaseRepository';
 import { useLeaseTenantRepository } from '@/hooks/repositories/useLeaseTenantRepository';
 import { usePropertyLeaseRepository } from '@/hooks/repositories/usePropertyLeaseRepository';
 import { useSecurityDepositRepository } from '@/hooks/repositories/useSecurityDepositRepository';
@@ -24,6 +25,10 @@ export const useGenerateLicenceOfOccupation = () => {
     getLeaseTenants: { execute: getLeaseTenants },
   } = useLeaseTenantRepository();
 
+  const {
+    getLeaseRenewals: { execute: getLeaseRenewals },
+  } = useLeaseRepository();
+
   const {
     getSecurityDeposits: { execute: getLeaseDeposits },
   } = useSecurityDepositRepository();
@@ -56,18 +61,27 @@ export const useGenerateLicenceOfOccupation = () => {
       const updatedLeasePromise = getLease(lease.id);
       const insurancesPromise = getInsurances(lease.id);
       const tenantsPromise = getLeaseTenants(lease.id);
+      const renewalsPromise = getLeaseRenewals(lease.id);
       const securityDepositsPromise = getLeaseDeposits(lease.id);
       const periodsPromise = getLeasePeriods(lease.id);
       const propertyLeasesPromise = getPropertyLeases(lease.id);
-      const [updatedLease, insurances, tenants, securityDeposits, periods, propertyLeases] =
-        await Promise.all([
-          updatedLeasePromise,
-          insurancesPromise,
-          tenantsPromise,
-          securityDepositsPromise,
-          periodsPromise,
-          propertyLeasesPromise,
-        ]);
+      const [
+        updatedLease,
+        insurances,
+        tenants,
+        renewals,
+        securityDeposits,
+        periods,
+        propertyLeases,
+      ] = await Promise.all([
+        updatedLeasePromise,
+        insurancesPromise,
+        tenantsPromise,
+        renewalsPromise,
+        securityDepositsPromise,
+        periodsPromise,
+        propertyLeasesPromise,
+      ]);
 
       if (!exists(updatedLease)) {
         throw new Error('Failed to load lease, reload this page to try again.');
@@ -81,6 +95,7 @@ export const useGenerateLicenceOfOccupation = () => {
         updatedLease,
         insurances ?? [],
         tenants ?? [],
+        renewals ?? [],
         securityDeposits ?? [],
         propertyLeases ?? [],
         periods ?? [],
diff --git a/source/frontend/src/features/mapSideBar/lease/common/LeaseHeader.tsx b/source/frontend/src/features/mapSideBar/lease/common/LeaseHeader.tsx
index 9bcd970e15..112d56ef87 100644
--- a/source/frontend/src/features/mapSideBar/lease/common/LeaseHeader.tsx
+++ b/source/frontend/src/features/mapSideBar/lease/common/LeaseHeader.tsx
@@ -14,6 +14,7 @@ import StatusField from '@/components/common/HeaderField/StatusField';
 import { StyledFiller } from '@/components/common/HeaderField/styles';
 import { InlineFlexDiv } from '@/components/common/styles';
 import { LeaseHeaderAddresses } from '@/features/leases/detail/LeaseHeaderAddresses';
+import { getCalculatedExpiry } from '@/features/leases/leaseUtils';
 import { Api_LastUpdatedBy } from '@/models/api/File';
 import { ApiGen_CodeTypes_LeaseStatusTypes } from '@/models/api/generated/ApiGen_CodeTypes_LeaseStatusTypes';
 import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease';
@@ -29,10 +30,12 @@ export interface ILeaseHeaderProps {
 }
 
 export const LeaseHeader: React.FC<ILeaseHeaderProps> = ({ lease, lastUpdatedBy }) => {
-  const isExpired = moment().isAfter(moment(lease?.expiryDate, 'YYYY-MM-DD'), 'day');
-
   const propertyIds = lease?.fileProperties?.map(fp => fp.propertyId) ?? [];
 
+  const calculatedExpiry = exists(lease) ? getCalculatedExpiry(lease, lease.renewals || []) : '';
+
+  const isExpired = moment().isAfter(moment(calculatedExpiry, 'YYYY-MM-DD'), 'day');
+
   return (
     <Container>
       <Row className="no-gutters">
@@ -66,7 +69,7 @@ export const LeaseHeader: React.FC<ILeaseHeaderProps> = ({ lease, lastUpdatedBy
             </HeaderContentCol>
             <HeaderLabelCol label="Expiry:" tooltip="The end date specified in the agreement." />
             <HeaderContentCol>
-              <span className="pl-2">{prettyFormatDate(lease?.expiryDate)}</span>
+              <span className="pl-2">{prettyFormatDate(calculatedExpiry)}</span>
             </HeaderContentCol>
             <HeaderContentCol>
               {isExpired && (
diff --git a/source/frontend/src/features/mapSideBar/property/PropertyContainer.tsx b/source/frontend/src/features/mapSideBar/property/PropertyContainer.tsx
index b1abb1fe67..9f5205d7e8 100644
--- a/source/frontend/src/features/mapSideBar/property/PropertyContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/property/PropertyContainer.tsx
@@ -18,6 +18,7 @@ import { useLeaseTenantRepository } from '@/hooks/repositories/useLeaseTenantRep
 import useKeycloakWrapper from '@/hooks/useKeycloakWrapper';
 import { ApiGen_Concepts_Association } from '@/models/api/generated/ApiGen_Concepts_Association';
 import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease';
+import { ApiGen_Concepts_LeaseRenewal } from '@/models/api/generated/ApiGen_Concepts_LeaseRenewal';
 import { ApiGen_Concepts_LeaseTenant } from '@/models/api/generated/ApiGen_Concepts_LeaseTenant';
 import { isValidId } from '@/utils';
 
@@ -30,6 +31,7 @@ export interface IPropertyContainerProps {
 export interface LeaseAssociationInfo {
   leaseDetails: ApiGen_Concepts_Lease[];
   leaseTenants: ApiGen_Concepts_LeaseTenant[];
+  leaseRenewals: ApiGen_Concepts_LeaseRenewal[];
   loading: boolean;
 }
 
@@ -37,6 +39,7 @@ export const getLeaseInfo = async (
   leasesAssociations: ApiGen_Concepts_Association[],
   getLease: (leaseId: number) => Promise<ApiGen_Concepts_Lease>,
   getLeaseTenants: (leaseId: number) => Promise<ApiGen_Concepts_LeaseTenant[]>,
+  getLeaseRenewals: (leaseId: number) => Promise<ApiGen_Concepts_LeaseRenewal[]>,
   setLeaseAssociationInfo: (info) => void,
 ) => {
   if (!leasesAssociations) return;
@@ -47,12 +50,17 @@ export const getLeaseInfo = async (
   const leaseTenantPromises = leasesAssociations?.map(leaseAssociation =>
     getLeaseTenants(leaseAssociation.id),
   );
+  const leaseRenewalPromises = leasesAssociations?.map(leaseAssociation =>
+    getLeaseRenewals(leaseAssociation.id),
+  );
 
   const leaseDetails = (await Promise.all(leaseDetailPromises)).flat();
   const leaseTenants = (await Promise.all(leaseTenantPromises)).flat();
+  const leaseRenewals = (await Promise.all(leaseRenewalPromises)).flat();
   setLeaseAssociationInfo({
     leaseDetails: leaseDetails,
     leaseTenants: leaseTenants,
+    leaseRenewals: leaseRenewals,
     loading: false,
   });
 };
@@ -67,9 +75,11 @@ export const PropertyContainer: React.FunctionComponent<
   const { hasClaim } = useKeycloakWrapper();
   const { getLease } = useLeaseRepository();
   const { getLeaseTenants } = useLeaseTenantRepository();
+  const { getLeaseRenewals } = useLeaseRepository();
   const [LeaseAssociationInfo, setLeaseAssociationInfo] = useState<LeaseAssociationInfo>({
     leaseDetails: [],
     leaseTenants: [],
+    leaseRenewals: [],
     loading: false,
   });
 
@@ -81,9 +91,16 @@ export const PropertyContainer: React.FunctionComponent<
         leaseAssociations,
         getLease.execute,
         getLeaseTenants.execute,
+        getLeaseRenewals.execute,
         setLeaseAssociationInfo,
       ),
-    [setLeaseAssociationInfo, leaseAssociations, getLeaseTenants.execute, getLease.execute],
+    [
+      setLeaseAssociationInfo,
+      leaseAssociations,
+      getLeaseTenants.execute,
+      getLeaseRenewals.execute,
+      getLease.execute,
+    ],
   );
 
   const tabViews: TabInventoryView[] = [];
@@ -150,6 +167,7 @@ export const PropertyContainer: React.FunctionComponent<
           associations={composedPropertyState.propertyAssociationWrapper?.response}
           associatedLeases={LeaseAssociationInfo?.leaseDetails ?? []}
           associatedLeaseTenants={LeaseAssociationInfo?.leaseTenants ?? []}
+          associatedLeaseRenewals={LeaseAssociationInfo?.leaseRenewals ?? []}
         />
       ),
       key: InventoryTabNames.pims,
@@ -164,7 +182,6 @@ export const PropertyContainer: React.FunctionComponent<
   ) {
     // After API property object has been received, we query relevant map layers to find
     // additional information which we store in a different model (IPropertyDetailsForm)
-
     tabViews.push({
       content: (
         <PropertyManagementTabView
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/LeaseAssociationContent.tsx b/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/LeaseAssociationContent.tsx
index 94596c979a..7c67e06bb6 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/LeaseAssociationContent.tsx
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/LeaseAssociationContent.tsx
@@ -6,9 +6,11 @@ import { CellProps } from 'react-table';
 
 import { UserNameTooltip } from '@/components/common/UserNameTooltip';
 import { ColumnWithProps, renderDate, Table } from '@/components/Table';
+import { getCalculatedExpiry } from '@/features/leases/leaseUtils';
 import { ApiGen_CodeTypes_LeaseTenantTypes } from '@/models/api/generated/ApiGen_CodeTypes_LeaseTenantTypes';
 import { ApiGen_Concepts_Association } from '@/models/api/generated/ApiGen_Concepts_Association';
 import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease';
+import { ApiGen_Concepts_LeaseRenewal } from '@/models/api/generated/ApiGen_Concepts_LeaseRenewal';
 import { ApiGen_Concepts_LeaseTenant } from '@/models/api/generated/ApiGen_Concepts_LeaseTenant';
 import { formatApiPersonNames } from '@/utils/personUtils';
 
@@ -28,6 +30,7 @@ interface IAssociationInfo {
 export interface ILeaseAssociationContentProps {
   associationName: string;
   tenants: ApiGen_Concepts_LeaseTenant[];
+  renewals: ApiGen_Concepts_LeaseRenewal[];
   leases: ApiGen_Concepts_Lease[];
   associations?: ApiGen_Concepts_Association[];
   linkUrlMask: string;
@@ -66,6 +69,9 @@ export const LeaseAssociationContent: React.FunctionComponent<
   }
   const tableData = orderBy(
     props.associations.map<IAssociationInfo>(x => {
+      const lease = find(props.leases, lease => x.id === lease.id);
+      const leaseRenewals = props.renewals.filter(renewal => x.id === renewal.leaseId);
+      const calculatedExpiry = getCalculatedExpiry(lease, leaseRenewals);
       return {
         id: x.id?.toString() || '',
         linkUrl: props.linkUrlMask.replace('|id|', x.id?.toString() || ''),
@@ -76,9 +82,7 @@ export const LeaseAssociationContent: React.FunctionComponent<
         createdDate: x.createdDateTime || '',
         status: x.status || '',
         tenants: getFormattedTenants(props.tenants.filter(tenant => x.id === tenant.leaseId)),
-        expiryDate: find(props.leases, lease => x.id === lease.id)
-          ? find(props.leases, lease => x.id === lease.id)?.expiryDate
-          : '',
+        expiryDate: calculatedExpiry,
       };
     }),
     (association: IAssociationInfo) => {
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/PropertyAssociationTabView.test.tsx b/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/PropertyAssociationTabView.test.tsx
index d93f154422..4e4104b02a 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/PropertyAssociationTabView.test.tsx
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/PropertyAssociationTabView.test.tsx
@@ -61,6 +61,7 @@ describe('PropertyAssociationTabView component', () => {
         isLoading={renderOptions.isLoading}
         associations={renderOptions.associations}
         associatedLeaseTenants={renderOptions.associatedLeaseTenants}
+        associatedLeaseRenewals={renderOptions.associatedLeaseRenewals}
         associatedLeases={renderOptions.associatedLeases}
       />,
       {
@@ -78,6 +79,7 @@ describe('PropertyAssociationTabView component', () => {
       isLoading: false,
       associations: fakeAssociations,
       associatedLeases: [],
+      associatedLeaseRenewals: [],
       associatedLeaseTenants: [],
     });
     expect(asFragment()).toMatchSnapshot();
@@ -102,6 +104,7 @@ describe('PropertyAssociationTabView component', () => {
           lessorType: { id: 'PER' } as ApiGen_Base_CodeType<string>,
         } as ApiGen_Concepts_LeaseTenant,
       ],
+      associatedLeaseRenewals: [],
     });
     expect(getByText('John Doe')).toBeVisible();
     expect(queryByText('John2 Doe2')).toBeNull();
@@ -126,6 +129,7 @@ describe('PropertyAssociationTabView component', () => {
           lessorType: { id: 'PER' } as ApiGen_Base_CodeType<string>,
         } as ApiGen_Concepts_LeaseTenant,
       ],
+      associatedLeaseRenewals: [],
     });
     expect(getByText('John Doe', { exact: false })).toBeVisible();
     expect(getByText('John2 Doe2', { exact: false })).toBeVisible();
@@ -150,6 +154,7 @@ describe('PropertyAssociationTabView component', () => {
           lessorType: { id: 'PER' } as ApiGen_Base_CodeType<string>,
         } as ApiGen_Concepts_LeaseTenant,
       ],
+      associatedLeaseRenewals: [],
     });
     expect(getByText('Org', { exact: false })).toBeVisible();
     expect(getByText('John2 Doe2', { exact: false })).toBeVisible();
@@ -161,7 +166,23 @@ describe('PropertyAssociationTabView component', () => {
       associations: fakeAssociations,
       associatedLeases: [{ id: 34, expiryDate: '2024-01-01' } as ApiGen_Concepts_Lease],
       associatedLeaseTenants: [],
+      associatedLeaseRenewals: [{
+        id: 1,
+        leaseId: 34,
+        commencementDt: '',
+        expiryDt: '2030-07-07',
+        isExercised: true,
+        renewalNote: '',
+        lease: undefined,
+        appCreateTimestamp: '',
+        appLastUpdateTimestamp: '',
+        appLastUpdateUserid: '',
+        appCreateUserid: '',
+        appLastUpdateUserGuid: '',
+        appCreateUserGuid: '',
+        rowVersion: 0
+      }]
     });
-    expect(getByText('Jan 1, 2024')).toBeVisible();
+    expect(getByText('Jul 7, 2030')).toBeVisible();
   });
 });
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/PropertyAssociationTabView.tsx b/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/PropertyAssociationTabView.tsx
index 13eb1d7283..32e8bd5f4e 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/PropertyAssociationTabView.tsx
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/PropertyAssociationTabView.tsx
@@ -8,6 +8,7 @@ import {
 import { Section } from '@/components/common/Section/Section';
 import { StyledSummarySection } from '@/components/common/Section/SectionStyles';
 import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease';
+import { ApiGen_Concepts_LeaseRenewal } from '@/models/api/generated/ApiGen_Concepts_LeaseRenewal';
 import { ApiGen_Concepts_LeaseTenant } from '@/models/api/generated/ApiGen_Concepts_LeaseTenant';
 import { ApiGen_Concepts_PropertyAssociations } from '@/models/api/generated/ApiGen_Concepts_PropertyAssociations';
 
@@ -20,6 +21,7 @@ export interface IPropertyAssociationTabViewProps {
   associations?: ApiGen_Concepts_PropertyAssociations;
   associatedLeases: ApiGen_Concepts_Lease[];
   associatedLeaseTenants: ApiGen_Concepts_LeaseTenant[];
+  associatedLeaseRenewals: ApiGen_Concepts_LeaseRenewal[];
 }
 
 const PropertyAssociationTabView: React.FunctionComponent<
@@ -76,6 +78,7 @@ const PropertyAssociationTabView: React.FunctionComponent<
           associations={props.associations?.leaseAssociations ?? undefined}
           linkUrlMask="/mapview/sidebar/lease/|id|"
           tenants={props.associatedLeaseTenants}
+          renewals={props.associatedLeaseRenewals}
           leases={props.associatedLeases}
         />
       </Section>
diff --git a/source/frontend/src/features/mapSideBar/shared/detail/PropertyFileContainer.tsx b/source/frontend/src/features/mapSideBar/shared/detail/PropertyFileContainer.tsx
index 2e8a73fa60..3fa8b9911a 100644
--- a/source/frontend/src/features/mapSideBar/shared/detail/PropertyFileContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/shared/detail/PropertyFileContainer.tsx
@@ -52,9 +52,11 @@ export const PropertyFileContainer: React.FunctionComponent<
 
   const { getLease } = useLeaseRepository();
   const { getLeaseTenants } = useLeaseTenantRepository();
+  const { getLeaseRenewals } = useLeaseRepository();
   const [LeaseAssociationInfo, setLeaseAssociationInfo] = useState<LeaseAssociationInfo>({
     leaseDetails: [],
     leaseTenants: [],
+    leaseRenewals: [],
     loading: false,
   });
 
@@ -66,9 +68,10 @@ export const PropertyFileContainer: React.FunctionComponent<
         leaseAssociations,
         getLease.execute,
         getLeaseTenants.execute,
+        getLeaseRenewals.execute,
         setLeaseAssociationInfo,
       ),
-    [setLeaseAssociationInfo, leaseAssociations, getLeaseTenants.execute, getLease.execute],
+    [leaseAssociations, getLease.execute, getLeaseTenants.execute, getLeaseRenewals.execute],
   );
 
   // After API property object has been received, we query relevant map layers to find
@@ -141,6 +144,7 @@ export const PropertyFileContainer: React.FunctionComponent<
           }
           associations={composedProperties.propertyAssociationWrapper?.response}
           associatedLeaseTenants={LeaseAssociationInfo.leaseTenants}
+          associatedLeaseRenewals={LeaseAssociationInfo.leaseRenewals}
           associatedLeases={LeaseAssociationInfo.leaseDetails}
         />
       ),
diff --git a/source/frontend/src/models/generate/lease/GenerateLease.test.ts b/source/frontend/src/models/generate/lease/GenerateLease.test.ts
index bcca2fbe89..4a2f848fb5 100644
--- a/source/frontend/src/models/generate/lease/GenerateLease.test.ts
+++ b/source/frontend/src/models/generate/lease/GenerateLease.test.ts
@@ -11,13 +11,14 @@ import { ApiGen_Concepts_SecurityDeposit } from '@/models/api/generated/ApiGen_C
 
 describe('GenerateLease tests', () => {
   it('generates an empty lease without throwing an error', () => {
-    const lease = new Api_GenerateLease({} as ApiGen_Concepts_Lease, [], [], [], [], []);
+    const lease = new Api_GenerateLease({} as ApiGen_Concepts_Lease, [], [], [], [], [], []);
     expect(lease.file_number).toBe('');
   });
 
   it('generates a lease with a commencement_date', () => {
     const lease = new Api_GenerateLease(
-      {} as ApiGen_Concepts_Lease,
+      { startDate: '2010-01-01' } as ApiGen_Concepts_Lease,
+      [],
       [],
       [],
       [],
@@ -27,7 +28,7 @@ describe('GenerateLease tests', () => {
         { startDate: '2022-02-02' } as ApiGen_Concepts_LeasePeriod,
       ],
     );
-    expect(lease.commencement_date).toBe(`January 01, 2020`);
+    expect(lease.commencement_date).toBe(`January 01, 2010`);
   });
 
   it('generates a lease with a full land_string', () => {
@@ -36,6 +37,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
       [
         {
           property: { pid: 1, landLegalDescription: 'test' } as ApiGen_Concepts_Property,
@@ -54,6 +56,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
       [
         {
           property: { pid: 1, landLegalDescription: 'test' } as ApiGen_Concepts_Property,
@@ -72,6 +75,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
       [
         {
           property: { pid: null, landLegalDescription: 'test' } as ApiGen_Concepts_Property,
@@ -90,6 +94,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
       [
         {
           property: { pid: 1, landLegalDescription: null } as ApiGen_Concepts_Property,
@@ -108,6 +113,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
       [
         {
           property: { pid: null, landLegalDescription: 'test' } as ApiGen_Concepts_Property,
@@ -120,7 +126,7 @@ describe('GenerateLease tests', () => {
   });
 
   it('generates a lease with no insurance information', () => {
-    const lease = new Api_GenerateLease({} as ApiGen_Concepts_Lease, [], [], [], [], []);
+    const lease = new Api_GenerateLease({} as ApiGen_Concepts_Lease, [], [], [], [], [], []);
     expect(lease.cgl_limit).toBe(`$0.00`);
     expect(lease.marine_liability_limit).toBe(`$0.00`);
     expect(lease.vehicle_liability_limit).toBe(`$0.00`);
@@ -135,6 +141,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
     );
     expect(lease.cgl_limit).toBe(`$1.00`);
     expect(lease.marine_liability_limit).toBe(`$0.00`);
@@ -150,6 +157,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
     );
     expect(lease.cgl_limit).toBe(`$0.00`);
     expect(lease.marine_liability_limit).toBe(`$1.00`);
@@ -165,6 +173,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
     );
     expect(lease.cgl_limit).toBe(`$0.00`);
     expect(lease.marine_liability_limit).toBe(`$0.00`);
@@ -180,6 +189,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
     );
     expect(lease.cgl_limit).toBe(`$0.00`);
     expect(lease.marine_liability_limit).toBe(`$0.00`);
@@ -188,7 +198,7 @@ describe('GenerateLease tests', () => {
   });
 
   it('generates a lease with no security deposit information', () => {
-    const lease = new Api_GenerateLease({} as ApiGen_Concepts_Lease, [], [], [], [], []);
+    const lease = new Api_GenerateLease({} as ApiGen_Concepts_Lease, [], [], [], [], [], []);
 
     expect(lease.security_amount).toBe(`$0.00`);
   });
@@ -198,6 +208,7 @@ describe('GenerateLease tests', () => {
       {} as ApiGen_Concepts_Lease,
       [],
       [],
+      [],
       [
         {
           id: 6,
@@ -250,6 +261,7 @@ describe('GenerateLease tests', () => {
       {} as ApiGen_Concepts_Lease,
       [],
       [],
+      [],
       [
         {
           id: 6,
@@ -336,7 +348,7 @@ describe('GenerateLease tests', () => {
   });
 
   it('generates a lease with no tenant information', () => {
-    const lease = new Api_GenerateLease({} as ApiGen_Concepts_Lease, [], [], [], [], []);
+    const lease = new Api_GenerateLease({} as ApiGen_Concepts_Lease, [], [], [], [], [], []);
     expect(lease.tenants).toHaveLength(0);
   });
 
@@ -350,6 +362,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
     );
     expect(lease.tenants).toHaveLength(0);
   });
@@ -367,6 +380,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
     );
     expect(lease.tenants).toHaveLength(1);
     expect(lease.tenants[0].name).toBe(`first middle last`);
@@ -382,6 +396,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
     );
     expect(lease.tenants).toHaveLength(1);
     expect(lease.tenants[0].name).toBe(`test org (Inc. No. )`);
@@ -400,6 +415,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
     );
     expect(lease.tenants).toHaveLength(1);
     expect(lease.tenants[0].name).toBe(`test org (Inc. No. 1234)`);
@@ -419,6 +435,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
     );
     expect(lease.tenants).toHaveLength(1);
     expect(lease.tenants[0].primary_contact?.full_name_string).toBe(`first middle last`);
@@ -449,6 +466,7 @@ describe('GenerateLease tests', () => {
       [],
       [],
       [],
+      [],
     );
     expect(lease.tenants).toHaveLength(1);
     expect(lease.tenants[0].email).toBe(`testprimary@test.ca`);
diff --git a/source/frontend/src/models/generate/lease/GenerateLease.ts b/source/frontend/src/models/generate/lease/GenerateLease.ts
index b0dd6d0abe..c17ab7ed52 100644
--- a/source/frontend/src/models/generate/lease/GenerateLease.ts
+++ b/source/frontend/src/models/generate/lease/GenerateLease.ts
@@ -1,13 +1,15 @@
 import { first, orderBy } from 'lodash';
 import moment from 'moment';
 
+import { getCalculatedExpiry } from '@/features/leases/leaseUtils';
 import { ApiGen_Concepts_Insurance } from '@/models/api/generated/ApiGen_Concepts_Insurance';
 import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease';
 import { ApiGen_Concepts_LeasePeriod } from '@/models/api/generated/ApiGen_Concepts_LeasePeriod';
+import { ApiGen_Concepts_LeaseRenewal } from '@/models/api/generated/ApiGen_Concepts_LeaseRenewal';
 import { ApiGen_Concepts_LeaseTenant } from '@/models/api/generated/ApiGen_Concepts_LeaseTenant';
 import { ApiGen_Concepts_PropertyLease } from '@/models/api/generated/ApiGen_Concepts_PropertyLease';
 import { ApiGen_Concepts_SecurityDeposit } from '@/models/api/generated/ApiGen_Concepts_SecurityDeposit';
-import { formatMoney, pidFormatter } from '@/utils';
+import { formatMoney, isValidIsoDateTime, pidFormatter } from '@/utils';
 
 import { Api_GenerateLeaseProperty } from './GenerateLeaseProperty';
 import { Api_GenerateSecurityDeposit } from './GenerateSecurityDeposit';
@@ -16,6 +18,7 @@ import { Api_GenerateTenant } from './GenerateTenant';
 export class Api_GenerateLease {
   file_number: string;
   commencement_date: string;
+  expiry_date: string;
   land_string: string;
   intended_use: string;
   term_end_date: string;
@@ -36,14 +39,20 @@ export class Api_GenerateLease {
     lease: ApiGen_Concepts_Lease,
     insurances: ApiGen_Concepts_Insurance[],
     tenants: ApiGen_Concepts_LeaseTenant[],
+    renewals: ApiGen_Concepts_LeaseRenewal[],
     securityDeposits: ApiGen_Concepts_SecurityDeposit[],
     propertyLeases: ApiGen_Concepts_PropertyLease[],
     periods: ApiGen_Concepts_LeasePeriod[],
   ) {
     const firstPeriod = first(orderBy(periods, (t: ApiGen_Concepts_LeasePeriod) => t.id));
+
     this.file_number = lease.lFileNo ?? '';
-    this.commencement_date = firstPeriod?.startDate
-      ? moment.utc(firstPeriod?.startDate).format('MMMM DD, YYYY')
+    this.commencement_date = isValidIsoDateTime(lease?.startDate)
+      ? moment.utc(lease.startDate).format('MMMM DD, YYYY')
+      : '';
+    this.expiry_date = getCalculatedExpiry(lease, renewals);
+    this.term_end_date = isValidIsoDateTime(this.expiry_date)
+      ? moment.utc(this.expiry_date).format('MMMM DD, YYYY') ?? ''
       : '';
     this.land_string =
       propertyLeases
@@ -56,9 +65,6 @@ export class Api_GenerateLease {
         )
         .join('\n\n') ?? '';
     this.intended_use = lease.description ?? '';
-    this.term_end_date = firstPeriod?.expiryDate
-      ? moment.utc(firstPeriod?.expiryDate).format('MMMM DD, YYYY') ?? ''
-      : '';
     this.payment_amount = formatMoney(firstPeriod?.paymentAmount ?? 0);
     this.payment_due_date = firstPeriod?.paymentDueDateStr ?? '';
     this.security_amount =