diff --git a/src/components/pages/Roles/RolePaymentDetails.tsx b/src/components/pages/Roles/RolePaymentDetails.tsx
index 5352ee1cf7..55d8688452 100644
--- a/src/components/pages/Roles/RolePaymentDetails.tsx
+++ b/src/components/pages/Roles/RolePaymentDetails.tsx
@@ -145,9 +145,9 @@ export function RolePaymentDetails({ payment, onClick, showWithdraw }: RolePayme
               textStyle="display-2xl"
               color="white-0"
             >
-              {payment.amount?.bigintValue
+              {payment.amount.bigintValue
                 ? formatCoin(
-                    payment.amount.bigintValue,
+                    payment.amount?.bigintValue,
                     false,
                     payment.asset?.decimals,
                     payment.asset?.symbol,
diff --git a/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx b/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx
index 083b1319a5..e47218719e 100644
--- a/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx
+++ b/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx
@@ -175,7 +175,7 @@ function FixedDate({ formIndex }: { formIndex: number }) {
 export default function RoleFormPaymentStream({ formIndex }: { formIndex: number }) {
   const { t } = useTranslation(['roles']);
   const { values, errors, setFieldValue } = useFormikContext<RoleFormValues>();
-  const { hatsTree, getPayment } = useRolesStore();
+  const { getPayment } = useRolesStore();
   const roleEditingPaymentsErrors = (errors.roleEditing as FormikErrors<RoleValue>)?.payments;
   return (
     <Box
@@ -239,7 +239,7 @@ export default function RoleFormPaymentStream({ formIndex }: { formIndex: number
       <FixedDate formIndex={formIndex} />
       <Flex justifyContent="flex-end">
         <Button
-          isDisabled={!!roleEditingPaymentsErrors || !values?.roleEditing?.payments || !hatsTree}
+          isDisabled={!!roleEditingPaymentsErrors}
           onClick={() => {
             setFieldValue('roleEditing.roleEditingPaymentIndex', undefined);
           }}