diff --git a/libs/ui/src/lib/account-balances/account-balances.component.ts b/libs/ui/src/lib/account-balances/account-balances.component.ts
index d6c20b895..1f96d7af6 100644
--- a/libs/ui/src/lib/account-balances/account-balances.component.ts
+++ b/libs/ui/src/lib/account-balances/account-balances.component.ts
@@ -122,10 +122,16 @@ export class GfAccountBalancesComponent
   }
 
   public async onSubmitAccountBalance() {
+    const { balance, date } = this.accountBalanceForm.value;
+
+    if (balance === null || balance === undefined || !date) {
+      return;
+    }
+
     const accountBalance: CreateAccountBalanceDto = {
+      balance,
       accountId: this.accountId,
-      balance: this.accountBalanceForm.get('balance').value,
-      date: format(this.accountBalanceForm.get('date').value, DATE_FORMAT)
+      date: format(date, DATE_FORMAT)
     };
 
     try {