diff --git a/src/components/pages/Roles/RoleCard.tsx b/src/components/pages/Roles/RoleCard.tsx
index 68f9980ac5..f621ceb412 100644
--- a/src/components/pages/Roles/RoleCard.tsx
+++ b/src/components/pages/Roles/RoleCard.tsx
@@ -101,20 +101,20 @@ function Payment({ payment }: { payment: SablierPayment | undefined }) {
   const { t } = useTranslation(['roles']);
   const format = ['years', 'days', 'hours'];
   const endDate =
-    payment?.scheduleFixedDate?.endDate &&
+    payment?.endDate &&
     formatDuration(
       intervalToDuration({
-        start: payment.scheduleFixedDate.startDate,
-        end: payment.scheduleFixedDate.endDate,
+        start: payment.startDate,
+        end: payment.endDate,
       }),
       { format },
     );
   const cliffDate =
-    payment?.scheduleFixedDate?.cliffDate &&
+    payment?.cliffDate &&
     formatDuration(
       intervalToDuration({
-        start: payment.scheduleFixedDate.startDate,
-        end: payment.scheduleFixedDate.cliffDate,
+        start: payment.startDate,
+        end: payment.cliffDate,
       }),
       { format },
     );
diff --git a/src/components/pages/Roles/RolePaymentDetails.tsx b/src/components/pages/Roles/RolePaymentDetails.tsx
index 9addc760c1..3ba814a0a8 100644
--- a/src/components/pages/Roles/RolePaymentDetails.tsx
+++ b/src/components/pages/Roles/RolePaymentDetails.tsx
@@ -121,20 +121,19 @@ export function RolePaymentDetails({
   }, [addressPrefix, navigate, safe?.address, withdraw]);
 
   const amountPerWeek = useMemo(() => {
-    if (!payment.amount || !payment.scheduleFixedDate) {
+    if (!payment.amount) {
       return;
     }
 
     const totalAmount = Number(payment.amount.value);
-    const endDate = payment.scheduleFixedDate.endDate.getTime();
-    const startDate = payment.scheduleFixedDate.startDate.getTime();
+    const endDate = payment.endDate.getTime();
+    const startDate = payment.startDate.getTime();
 
     const totalMilliseconds = endDate - startDate;
     const totalWeeks = totalMilliseconds / (1000 * 60 * 60 * 24 * 7);
-    const roundedWeeks = Math.ceil(totalWeeks);
 
-    return totalAmount / roundedWeeks;
-  }, [payment.amount, payment.scheduleFixedDate]);
+    return totalAmount / totalWeeks;
+  }, [payment]);
 
   const streamAmountUSD = useMemo(() => {
     if (!payment.amount) {
@@ -148,7 +147,7 @@ export function RolePaymentDetails({
       return;
     }
     return Number(payment.amount.value) * foundAsset.usdPrice;
-  }, [payment.amount, payment.asset.address, assetsFungible]);
+  }, [payment.amount, payment.asset?.address, assetsFungible]);
 
   return (
     <Box
@@ -171,11 +170,11 @@ export function RolePaymentDetails({
               textStyle="display-2xl"
               color="white-0"
             >
-              {payment.amount.bigintValue
+              {payment.amount?.bigintValue
                 ? formatCoin(
                     payment.amount.bigintValue,
                     false,
-                    payment.asset.decimals,
+                    payment.asset?.decimals,
                     payment.asset?.symbol,
                   )
                 : undefined}
@@ -191,7 +190,7 @@ export function RolePaymentDetails({
               p="0.5rem"
             >
               <Image
-                src={payment.asset.logo}
+                src={payment.asset?.logo}
                 fallbackSrc="/images/coin-icon-default.svg"
                 boxSize="1.5rem"
               />
@@ -199,7 +198,7 @@ export function RolePaymentDetails({
                 textStyle="label-base"
                 color="white-0"
               >
-                {payment.asset.symbol ?? t('selectLabel', { ns: 'modals' })}
+                {payment.asset?.symbol ?? t('selectLabel', { ns: 'modals' })}
               </Text>
             </Flex>
           </Flex>
@@ -219,7 +218,7 @@ export function RolePaymentDetails({
                 textStyle="label-small"
                 color="white-0"
               >
-                {`${amountPerWeek} ${payment.asset.symbol} / ${t('week')}`}
+                {`${amountPerWeek?.toLocaleString()} ${payment.asset?.symbol} / ${t('week')}`}
               </Text>
             </Flex>
           </Flex>
@@ -240,7 +239,7 @@ export function RolePaymentDetails({
           <GridItem area="starting">
             <PaymentDate
               label="Starting"
-              date={payment.scheduleFixedDate?.startDate}
+              date={payment.startDate}
             />
           </GridItem>
           <GridItem area="dividerOne">
@@ -255,7 +254,7 @@ export function RolePaymentDetails({
           <GridItem area="cliff">
             <PaymentDate
               label="Cliff"
-              date={payment.scheduleFixedDate?.cliffDate}
+              date={payment.cliffDate}
             />
           </GridItem>
           <GridItem area="dividerTwo">
@@ -270,7 +269,7 @@ export function RolePaymentDetails({
           <GridItem area="ending">
             <PaymentDate
               label="Ending"
-              date={payment.scheduleFixedDate?.endDate}
+              date={payment.endDate}
             />
           </GridItem>
         </Grid>
diff --git a/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx b/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx
index 0468411332..e47218719e 100644
--- a/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx
+++ b/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx
@@ -6,165 +6,25 @@ import {
   Grid,
   GridItem,
   Icon,
-  IconButton,
   Menu,
   MenuButton,
   MenuList,
-  NumberInput,
-  NumberInputField,
   Show,
-  Tab,
-  TabList,
-  TabPanel,
-  TabPanels,
-  Tabs,
-  Text,
 } from '@chakra-ui/react';
-import { ArrowLeft, ArrowRight, Minus, Plus } from '@phosphor-icons/react';
-import { Field, FieldProps, FormikErrors, useFormikContext } from 'formik';
+import { ArrowLeft, ArrowRight } from '@phosphor-icons/react';
+import { Field, FormikErrors, useFormikContext } from 'formik';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { getAddress } from 'viem';
 import { CARD_SHADOW } from '../../../../constants/common';
 import { useRolesStore } from '../../../../store/roles';
 import DraggableDrawer from '../../../ui/containers/DraggableDrawer';
-import LabelWrapper from '../../../ui/forms/LabelWrapper';
 import { DecentDatePicker } from '../../../ui/utils/DecentDatePicker';
 import { DatePickerTrigger } from '../DatePickerTrigger';
 import { RoleFormValues, RoleValue } from '../types';
 import { AssetSelector } from './RoleFormAssetSelector';
 import { SectionTitle } from './RoleFormSectionTitle';
 
-function DurationTicker({
-  fieldName,
-  fieldType,
-  formIndex,
-}: {
-  fieldType: 'duration' | 'cliffDuration';
-  fieldName: 'years' | 'days' | 'hours';
-  formIndex: number;
-}) {
-  const { t } = useTranslation(['roles']);
-  return (
-    <FormControl>
-      <Field
-        name={`roleEditing.payments[${formIndex}].scheduleDuration.[${fieldType}].[${fieldName}]`}
-      >
-        {({ field, form: { setFieldValue }, meta }: FieldProps<string, RoleFormValues>) => {
-          return (
-            <LabelWrapper
-              label={t(fieldName)}
-              errorMessage={meta.error && meta.touched ? meta.error : undefined}
-            >
-              <Flex gap="0.25rem">
-                <IconButton
-                  aria-label="stepper-minus"
-                  minW="40px"
-                  h="40px"
-                  variant="stepper"
-                  icon={
-                    <Icon
-                      as={Minus}
-                      boxSize="1rem"
-                    />
-                  }
-                  onClick={() => {
-                    if (field.value === undefined || Number(field.value) <= 0) return;
-                    setFieldValue(field.name, Number(field.value) - 1);
-                  }}
-                />
-                <NumberInput
-                  w="full"
-                  value={field.value}
-                  onChange={(value: string) => setFieldValue(field.name, Number(value))}
-                >
-                  <NumberInputField />
-                </NumberInput>
-                <IconButton
-                  aria-label="stepper-plus"
-                  minW="40px"
-                  h="40px"
-                  variant="stepper"
-                  icon={
-                    <Icon
-                      as={Plus}
-                      boxSize="1rem"
-                    />
-                  }
-                  onClick={() => {
-                    if (field.value === undefined) {
-                      setFieldValue(field.name, 1);
-                      return;
-                    }
-                    setFieldValue(field.name, Number(field.value) + 1);
-                  }}
-                />
-              </Flex>
-            </LabelWrapper>
-          );
-        }}
-      </Field>
-    </FormControl>
-  );
-}
-
-function ScheduleDuration({ formIndex }: { formIndex: number }) {
-  return (
-    <Flex
-      flexDir="column"
-      gap="0.5rem"
-    >
-      <DurationTicker
-        fieldName="years"
-        fieldType="duration"
-        formIndex={formIndex}
-      />
-      <DurationTicker
-        fieldName="days"
-        fieldType="duration"
-        formIndex={formIndex}
-      />
-      <DurationTicker
-        fieldName="hours"
-        fieldType="duration"
-        formIndex={formIndex}
-      />
-    </Flex>
-  );
-}
-
-function CliffDuration({ formIndex }: { formIndex: number }) {
-  const { t } = useTranslation(['roles']);
-  return (
-    <Flex
-      flexDir="column"
-      gap="0.5rem"
-    >
-      <SectionTitle
-        title={t('cliff')}
-        subTitle={t('cliffSubTitle')}
-      />
-      <Box mt="1rem">
-        <DurationTicker
-          fieldName="years"
-          fieldType="cliffDuration"
-          formIndex={formIndex}
-        />
-        <DurationTicker
-          fieldName="days"
-          fieldType="cliffDuration"
-          formIndex={formIndex}
-        />
-        <DurationTicker
-          fieldName="hours"
-          fieldType="cliffDuration"
-          formIndex={formIndex}
-        />
-      </Box>
-    </Flex>
-  );
-}
-
 function PaymentDatePicker({
   type,
   formIndex,
@@ -174,7 +34,7 @@ function PaymentDatePicker({
 }) {
   const { setFieldValue, values } = useFormikContext<RoleFormValues>();
 
-  const selectedDate = values.roleEditing?.payments?.[formIndex].scheduleFixedDate?.[type];
+  const selectedDate = values.roleEditing?.payments?.[formIndex][type];
 
   const [isDrawerOpen, setIsDrawerOpen] = useState(false);
 
@@ -182,22 +42,19 @@ function PaymentDatePicker({
 
   const onCliffDateChange = isCliffDate
     ? (date: Date) => {
-        setFieldValue(`roleEditing.payments[${formIndex}].scheduleFixedDate.cliffDate`, date);
+        setFieldValue(`roleEditing.payments[${formIndex}].cliffDate`, date);
       }
     : undefined;
 
   const onDateRangeChange = !isCliffDate
     ? (dateRange: Date[]) => {
-        setFieldValue(
-          `roleEditing.payments[${formIndex}].scheduleFixedDate.startDate`,
-          dateRange[0],
-        );
-        setFieldValue(`roleEditing.payments[${formIndex}].scheduleFixedDate.endDate`, dateRange[1]);
+        setFieldValue(`roleEditing.payments[${formIndex}].startDate`, dateRange[0]);
+        setFieldValue(`roleEditing.payments[${formIndex}].endDate`, dateRange[1]);
       }
     : undefined;
 
   return (
-    <Field name={`roleEditing.payments[${formIndex}].scheduleFixedDate.${type}`}>
+    <Field name={`roleEditing.payments[${formIndex}].${type}`}>
       {() => (
         <>
           <Show below="md">
@@ -257,7 +114,6 @@ function FixedDate({ formIndex }: { formIndex: number }) {
 
   return (
     <Box>
-      <Text textStyle="label-base"> {t('fixedDates')} </Text>
       <FormControl my="1rem">
         <Grid
           gridTemplateAreas={{
@@ -316,51 +172,6 @@ function FixedDate({ formIndex }: { formIndex: number }) {
   );
 }
 
-function DurationTabs({ formIndex }: { formIndex: number }) {
-  const { t } = useTranslation(['roles']);
-  const { setFieldValue } = useFormikContext<RoleFormValues>();
-
-  return (
-    <Tabs
-      variant={'twoTone'}
-      my="1rem"
-    >
-      <TabList my="1rem">
-        <Tab
-          onClick={() =>
-            setFieldValue(`roleEditing.payments[${formIndex}].scheduleType`, 'duration')
-          }
-        >
-          {t('duration')}
-        </Tab>
-        <Tab
-          onClick={() =>
-            setFieldValue(`roleEditing.payments[${formIndex}].scheduleType`, 'fixedDate')
-          }
-        >
-          {t('fixedDates')}
-        </Tab>
-      </TabList>
-
-      <TabPanels>
-        <TabPanel>
-          <Flex
-            flexDir="column"
-            gap="1rem"
-          >
-            <ScheduleDuration formIndex={formIndex} />
-            <CliffDuration formIndex={formIndex} />
-          </Flex>
-        </TabPanel>
-
-        <TabPanel>
-          <FixedDate formIndex={formIndex} />
-        </TabPanel>
-      </TabPanels>
-    </Tabs>
-  );
-}
-
 export default function RoleFormPaymentStream({ formIndex }: { formIndex: number }) {
   const { t } = useTranslation(['roles']);
   const { values, errors, setFieldValue } = useFormikContext<RoleFormValues>();
@@ -425,7 +236,7 @@ export default function RoleFormPaymentStream({ formIndex }: { formIndex: number
         subTitle={t('scheduleSubTitle')}
         tooltipContent={t('cliffPaymentTooltip')}
       />
-      <DurationTabs formIndex={formIndex} />
+      <FixedDate formIndex={formIndex} />
       <Flex justifyContent="flex-end">
         <Button
           isDisabled={!!roleEditingPaymentsErrors}
diff --git a/src/components/pages/Roles/forms/RoleFormPaymentStreams.tsx b/src/components/pages/Roles/forms/RoleFormPaymentStreams.tsx
index d0c173d63a..f89171a473 100644
--- a/src/components/pages/Roles/forms/RoleFormPaymentStreams.tsx
+++ b/src/components/pages/Roles/forms/RoleFormPaymentStreams.tsx
@@ -7,7 +7,7 @@ import { RoleFormValues } from '../types';
 
 export function RoleFormPaymentStreams() {
   const { t } = useTranslation(['roles']);
-  const { values, setFieldValue } = useFormikContext<RoleFormValues>();
+  const { values, setFieldValue, validateForm } = useFormikContext<RoleFormValues>();
   const payments = values.roleEditing?.payments;
 
   return (
@@ -18,10 +18,9 @@ export function RoleFormPaymentStreams() {
             variant="secondary"
             size="sm"
             leftIcon={<Plus />}
-            onClick={() => {
-              pushPayment({
-                scheduleType: 'duration',
-              });
+            onClick={async () => {
+              pushPayment({});
+              await validateForm();
               setFieldValue('roleEditing.roleEditingPaymentIndex', (payments ?? []).length);
             }}
           >
diff --git a/src/components/pages/Roles/forms/useRoleFormEditedRole.tsx b/src/components/pages/Roles/forms/useRoleFormEditedRole.tsx
index cadd6d573c..ab49012ca9 100644
--- a/src/components/pages/Roles/forms/useRoleFormEditedRole.tsx
+++ b/src/components/pages/Roles/forms/useRoleFormEditedRole.tsx
@@ -30,27 +30,35 @@ export function useRoleFormEditedRole({ hatsTree }: { hatsTree: DecentTree | und
     !!existingRoleHat && values.roleEditing?.wearer !== existingRoleHat.wearer;
 
   const isPaymentsUpdated = useMemo(() => {
-    if (!existingRoleHat?.payments?.length || !values.roleEditing || !values.roleEditing.payments) {
+    if (!values.roleEditing || !values.roleEditing.payments) {
       return false;
     }
     return values.roleEditing.payments.some(payment => {
-      const existingPayment = existingRoleHat.payments?.find(p => p.streamId === payment.streamId);
+      const existingPayment = existingRoleHat?.payments?.find(p => p.streamId === payment.streamId);
       if (!existingPayment) {
-        return false;
+        return true;
       }
+
+      const hasAddedCliff = !!payment.cliffDate || !existingPayment.cliffDate;
+      const hasRemovedCliff = !payment.cliffDate || !!existingPayment.cliffDate;
+      const hasCliffChanged =
+        !!payment.cliffDate &&
+        !!existingPayment.cliffDate &&
+        payment.cliffDate.getTime() !== existingPayment.cliffDate.getTime();
+      const hasAmountChanged = payment.amount !== existingPayment.amount;
+      const hasAssetChanged = payment.asset.address !== existingPayment.asset.address;
+      const hasStartDateChanged =
+        payment.startDate.getTime() !== existingPayment.startDate.getTime();
+      const hasEndDateChanged = payment.endDate.getTime() !== existingPayment.endDate.getTime();
+
       return (
-        payment.amount !== existingPayment.amount ||
-        payment.scheduleType !== existingPayment.scheduleType ||
-        payment.scheduleDuration?.cliffDuration?.days !==
-          existingPayment.scheduleDuration?.cliffDuration?.days ||
-        payment.scheduleDuration?.cliffDuration?.hours !==
-          existingPayment.scheduleDuration?.cliffDuration?.hours ||
-        payment.scheduleDuration?.cliffDuration?.years !==
-          existingPayment.scheduleDuration?.cliffDuration?.years ||
-        payment.asset.address !== existingPayment.asset.address ||
-        payment.scheduleFixedDate?.cliffDate !== existingPayment.scheduleFixedDate?.cliffDate ||
-        payment.scheduleFixedDate?.startDate !== existingPayment.scheduleFixedDate?.startDate ||
-        payment.scheduleFixedDate?.endDate !== existingPayment.scheduleFixedDate?.endDate
+        hasAddedCliff ||
+        hasRemovedCliff ||
+        hasCliffChanged ||
+        hasAmountChanged ||
+        hasAssetChanged ||
+        hasStartDateChanged ||
+        hasEndDateChanged
       );
     });
   }, [existingRoleHat, values.roleEditing]);
diff --git a/src/components/pages/Roles/types.tsx b/src/components/pages/Roles/types.tsx
index 86d5a01fbe..edd5db27a6 100644
--- a/src/components/pages/Roles/types.tsx
+++ b/src/components/pages/Roles/types.tsx
@@ -20,16 +20,9 @@ export interface BaseSablierStream {
 }
 
 export interface SablierPayment extends BaseSablierStream {
-  scheduleDuration?: {
-    duration: DurationBreakdown;
-    cliffDuration: DurationBreakdown | undefined;
-  };
-  scheduleFixedDate?: {
-    startDate: Date;
-    endDate: Date;
-    cliffDate: Date | undefined;
-  };
-  scheduleType: 'duration' | 'fixedDate';
+  startDate: Date;
+  endDate: Date;
+  cliffDate: Date | undefined;
 }
 
 export interface RoleProps {
diff --git a/src/hooks/DAO/loaders/useHatsTree.ts b/src/hooks/DAO/loaders/useHatsTree.ts
index fca6c1916d..24beb6d8dd 100644
--- a/src/hooks/DAO/loaders/useHatsTree.ts
+++ b/src/hooks/DAO/loaders/useHatsTree.ts
@@ -1,6 +1,5 @@
 import { useApolloClient } from '@apollo/client';
 import { Tree, HatsSubgraphClient } from '@hatsprotocol/sdk-v1-subgraph';
-import { intervalToDuration } from 'date-fns';
 import { useEffect } from 'react';
 import { toast } from 'react-toastify';
 import { getAddress } from 'viem';
@@ -17,27 +16,6 @@ const hatsSubgraphClient = new HatsSubgraphClient({
   // TODO config for prod
 });
 
-function convertDuration(_duration: number): { years: number; days: number; hours: number } {
-  let duration = (_duration ?? 0) * 1000;
-  const millisecondsInAnHour = 1000 * 60 * 60;
-  const millisecondsInADay = millisecondsInAnHour * 24;
-  const millisecondsInAYear = millisecondsInADay * 365; // Approximation, does not account for leap years
-
-  const years = Math.floor(duration / millisecondsInAYear);
-  duration -= years * millisecondsInAYear;
-
-  const days = Math.floor(duration / millisecondsInADay);
-  duration -= days * millisecondsInADay;
-
-  const hours = Math.floor(duration / millisecondsInAnHour);
-
-  return {
-    years,
-    days,
-    hours,
-  };
-}
-
 const useHatsTree = () => {
   const { hatsTreeId, hatsTree, streamsFetched, setHatsTree, updateRolesWithStreams } =
     useRolesStore();
@@ -203,19 +181,6 @@ const useHatsTree = () => {
                   const parsedAmount =
                     BigInt(lockupLinearStream.depositAmount) /
                     10n ** BigInt(lockupLinearStream.asset.decimals);
-                  const cliffDuration = lockupLinearStream.cliff
-                    ? (() => {
-                        const duration = intervalToDuration({
-                          start: secondsTimestampToDate(lockupLinearStream.startTime),
-                          end: secondsTimestampToDate(lockupLinearStream.cliffTime),
-                        });
-                        return {
-                          years: duration.years || 0,
-                          days: duration.days || 0,
-                          hours: duration.hours || 0,
-                        };
-                      })()
-                    : undefined;
 
                   return {
                     streamId: lockupLinearStream.id,
@@ -234,18 +199,11 @@ const useHatsTree = () => {
                       bigintValue: lockupLinearStream.depositAmount,
                       value: parsedAmount.toString(),
                     },
-                    scheduleFixedDate: {
-                      startDate: secondsTimestampToDate(lockupLinearStream.startTime),
-                      endDate: secondsTimestampToDate(lockupLinearStream.endTime),
-                      cliffDate: lockupLinearStream.cliff
-                        ? secondsTimestampToDate(lockupLinearStream.cliffTime)
-                        : undefined,
-                    },
-                    scheduleDuration: {
-                      duration: convertDuration(lockupLinearStream.duration),
-                      cliffDuration,
-                    },
-                    scheduleType: 'duration',
+                    startDate: secondsTimestampToDate(lockupLinearStream.startTime),
+                    endDate: secondsTimestampToDate(lockupLinearStream.endTime),
+                    cliffDate: lockupLinearStream.cliff
+                      ? secondsTimestampToDate(lockupLinearStream.cliffTime)
+                      : undefined,
                     // @todo - factor in cliff date.
                     // @todo - handle cancelled streams
                     isActive:
diff --git a/src/hooks/schemas/roles/useRolesSchema.ts b/src/hooks/schemas/roles/useRolesSchema.ts
index 26e6324221..192b32a909 100644
--- a/src/hooks/schemas/roles/useRolesSchema.ts
+++ b/src/hooks/schemas/roles/useRolesSchema.ts
@@ -49,89 +49,20 @@ export const useRolesSchema = () => {
                           .shape({
                             asset: assetValidationSchema,
                             amount: bigIntValidationSchema,
-                            scheduleType: Yup.string()
-                              .oneOf(['duration', 'fixedDate'])
-                              .required()
-                              .default('duration'),
-
-                            // If duration tab is selected and its form has a value, then validate it:
-                            // duration and cliff should both have years, days, and hours
-                            scheduleDuration: Yup.object()
-                              .default(undefined)
-                              .nullable()
-                              .shape({
-                                duration: Yup.object().shape({
-                                  years: Yup.number().required().default(0),
-                                  days: Yup.number().required().default(0),
-                                  hours: Yup.number().required().default(0),
-                                }),
-                                cliffDuration: Yup.object().shape({
-                                  years: Yup.number().required().default(0),
-                                  days: Yup.number().required().default(0),
-                                  hours: Yup.number().required().default(0),
-                                }),
-                              })
-                              .test({
-                                name: 'valid-payment-schedule',
-                                message: t('roleInfoErrorPaymentScheduleInvalid'),
-                                test: _scheduleDuration => {
-                                  if (!_scheduleDuration) return true;
-
-                                  const { duration } = _scheduleDuration;
-
-                                  const hasDuration =
-                                    !!_scheduleDuration &&
-                                    (!!_scheduleDuration.duration ||
-                                      !!_scheduleDuration.cliffDuration);
-                                  if (hasDuration) {
-                                    return (
-                                      duration.years > 0 || duration.days > 0 || duration.hours > 0
-                                    );
-                                  }
-                                },
-                              }),
-
-                            // If fixed date tab is selected and its form has a value, then validate it:
-                            // fixed date should have a start date and an end date
-                            scheduleFixedDate: Yup.object()
-                              .default(undefined)
-                              .nullable()
-                              .shape({
-                                startDate: Yup.date().required(
-                                  t('roleInfoErrorPaymentFixedDateStartDateRequired'),
-                                ),
-                                endDate: Yup.date().required(
-                                  t('roleInfoErrorPaymentFixedDateEndDateRequired'),
-                                ),
-                              })
-                              .test({
-                                name: 'end-date-after-start-date',
-                                message: t('roleInfoErrorPaymentFixedDateEndDateAfterStartDate'),
-                                test: _scheduleFixedDate => {
-                                  if (!_scheduleFixedDate) return true;
-
-                                  const { startDate, endDate } = _scheduleFixedDate;
-                                  return endDate > startDate;
-                                },
-                              }),
+                            startDate: Yup.date().required(
+                              t('roleInfoErrorPaymentFixedDateStartDateRequired'),
+                            ),
+                            endDate: Yup.date().required(
+                              t('roleInfoErrorPaymentFixedDateEndDateRequired'),
+                            ),
                           })
                           .test({
-                            name: 'either-duration-or-fixed-date-required',
-                            message: t('roleInfoErrorPaymentScheduleOrFixedDateRequired'),
-                            test: vestingFormValue => {
-                              if (!vestingFormValue) return true;
-
-                              const { scheduleDuration, scheduleFixedDate } = vestingFormValue;
-
-                              const hasDuration =
-                                scheduleDuration &&
-                                (scheduleDuration.duration || scheduleDuration.cliffDuration);
-
-                              const hasFixedDate =
-                                scheduleFixedDate &&
-                                (scheduleFixedDate.startDate || scheduleFixedDate.endDate);
-
-                              return !!hasDuration || !!hasFixedDate;
+                            name: 'end-date-after-start-date',
+                            message: t('roleInfoErrorPaymentFixedDateEndDateAfterStartDate'),
+                            test: _payments => {
+                              if (!_payments) return false;
+                              const { startDate, endDate } = _payments;
+                              return endDate > startDate;
                             },
                           }),
                     }),
diff --git a/src/hooks/streams/useCreateSablierStream.ts b/src/hooks/streams/useCreateSablierStream.ts
index b1d63dea7f..2581dc9405 100644
--- a/src/hooks/streams/useCreateSablierStream.ts
+++ b/src/hooks/streams/useCreateSablierStream.ts
@@ -163,22 +163,17 @@ export default function useCreateSablierStream() {
           }
           totalStreamsAmount += streamData.amount.bigintValue;
           const recipient = recipients[index];
-          const schedule =
-            streamData.scheduleType === 'duration' && streamData.scheduleDuration
-              ? streamData.scheduleDuration.duration
-              : {
-                  startDate: streamData.scheduleFixedDate!.startDate.getTime(),
-                  endDate: streamData.scheduleFixedDate!.endDate.getTime(),
-                };
+          const schedule = {
+            startDate: streamData.startDate.getTime(),
+            endDate: streamData.endDate.getTime(),
+          };
           const cliff =
-            streamData.scheduleType === 'duration'
-              ? streamData.scheduleDuration!.cliffDuration
-              : streamData.scheduleFixedDate?.cliffDate !== undefined
-                ? {
-                    startDate: streamData.scheduleFixedDate!.cliffDate.getTime(),
-                    endDate: streamData.scheduleFixedDate!.cliffDate.getTime(),
-                  }
-                : undefined;
+            streamData.cliffDate !== undefined
+              ? {
+                  startDate: streamData.cliffDate.getTime(),
+                  endDate: streamData.cliffDate.getTime(),
+                }
+              : undefined;
 
           const assembledStream = prepareLinearStream({
             recipient,