diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
index fd294e31a..464de16a3 100644
--- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
+++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
@@ -204,7 +204,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
         isEqualAmortization: this.loansAccountTermsData.isEqualAmortization,
         interestType: this.loansAccountTermsData.interestType.id,
         // TODO: 2025-03-17: Is this correct?
-        isFloatingInterestRate: this.loansAccountTermsData.isLoanProductLinkedToFloatingRate ? false : '',
+        isFloatingInterestRate: this.loansAccountTermsData.isLoanProductLinkedToFloatingRate ? false : null,
         interestCalculationPeriodType: this.loansAccountTermsData.interestCalculationPeriodType.id,
         allowPartialPeriodInterestCalculation: this.loansAccountTermsData.allowPartialPeriodInterestCalculation,
         inArrearsTolerance: this.loansAccountTermsData.inArrearsTolerance,
@@ -291,12 +291,12 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
       if (this.allowAddDisbursementDetails()) {
         this.loansAccountTermsForm.addControl(
           'maxOutstandingLoanBalance',
-          new UntypedFormControl(this.loansAccountTermsData.maxOutstandingLoanBalance, Validators.required)
+          new UntypedFormControl(this.loansAccountTermsData?.maxOutstandingLoanBalance ?? null, Validators.required)
         );
       } else {
         this.loansAccountTermsForm.addControl(
           'maxOutstandingLoanBalance',
-          new UntypedFormControl(this.loansAccountTermsData.maxOutstandingLoanBalance)
+          new UntypedFormControl(this.loansAccountTermsData?.maxOutstandingLoanBalance ?? null)
         );
       }
     }
@@ -330,7 +330,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
         amortizationType: this.loansAccountTermsData.amortizationType.id,
         isEqualAmortization: this.loansAccountTermsData.isEqualAmortization,
         interestType: this.loansAccountTermsData.interestType.id,
-        isFloatingInterestRate: this.loansAccountTermsData.isLoanProductLinkedToFloatingRate ? false : '',
+        isFloatingInterestRate: this.loansAccountTermsData.isLoanProductLinkedToFloatingRate ? false : null,
         interestCalculationPeriodType: this.loansAccountTermsData.interestCalculationPeriodType.id,
         allowPartialPeriodInterestCalculation: this.loansAccountTermsData.allowPartialPeriodInterestCalculation,
         inArrearsTolerance: this.loansAccountTermsData.inArrearsTolerance,
@@ -358,12 +358,12 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
       this.loansAccountTermsForm.removeControl('maxOutstandingLoanBalance');
       this.loansAccountTermsForm.addControl(
         'maxOutstandingLoanBalance',
-        new UntypedFormControl(this.loansAccountTermsData.maxOutstandingLoanBalance, Validators.required)
+        new UntypedFormControl(this.loansAccountTermsData?.maxOutstandingLoanBalance ?? null, Validators.required)
       );
     } else {
       this.loansAccountTermsForm.addControl(
         'maxOutstandingLoanBalance',
-        new UntypedFormControl(this.loansAccountTermsData.maxOutstandingLoanBalance)
+        new UntypedFormControl(this.loansAccountTermsData?.maxOutstandingLoanBalance ?? null)
       );
     }
   }
@@ -492,7 +492,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
       interestChargedFromDate: [''],
       interestRatePerPeriod: [''],
       interestType: [''],
-      isFloatingInterestRate: [''],
+      isFloatingInterestRate: [null],
       isEqualAmortization: [''],
       amortizationType: [
         '',