diff --git a/src/components/POLine/OngoingOrder/OngoingOrderForm.js b/src/components/POLine/OngoingOrder/OngoingOrderForm.js
index 38ef9ba6b..746349835 100644
--- a/src/components/POLine/OngoingOrder/OngoingOrderForm.js
+++ b/src/components/POLine/OngoingOrder/OngoingOrderForm.js
@@ -90,7 +90,6 @@ const OngoingOrderForm = ({
               name={POL_FORM_FIELDS.multiYearPayment}
               onChange={onMultiYearPaymentChange}
               type="checkbox"
-              validateFields={[]}
               vertical
             />
           </VisibilityControl>
diff --git a/src/components/POLine/PaymentTerms/PaymentTermsForm/PaymentTermsForm.js b/src/components/POLine/PaymentTerms/PaymentTermsForm/PaymentTermsForm.js
index 1ad30cb9b..eaa986f7b 100644
--- a/src/components/POLine/PaymentTerms/PaymentTermsForm/PaymentTermsForm.js
+++ b/src/components/POLine/PaymentTerms/PaymentTermsForm/PaymentTermsForm.js
@@ -1,4 +1,3 @@
-import { noop } from 'lodash';
 import PropTypes from 'prop-types';
 import {
   useCallback,
@@ -164,7 +163,7 @@ export const PaymentTermsForm = ({
 
     try {
       const error = await composeValidatorsAsync(
-        isRequired ? validateFundDistributionRequired : noop,
+        validateFundDistributionRequired,
         validateFundDistributionUniqueFunds,
         fundDistributionTotalValidator,
       )(value);
@@ -175,7 +174,7 @@ export const PaymentTermsForm = ({
     } finally {
       setIsFundDistributionValidating(false);
     }
-  }, [fundDistributionTotalValidator, isRequired]);
+  }, [fundDistributionTotalValidator]);
 
   return (
     <>
@@ -242,7 +241,7 @@ export const PaymentTermsForm = ({
             onRemoveFiscalYear={onRemoveFiscalYearDistribution}
             onRemoveFundDistribution={onRemoveFundDistribution}
             totalAmount={totalPrice}
-            validate={validateFiscalYearsDistributions}
+            validate={isRequired ? validateFiscalYearsDistributions : undefined}
           />
         </Col>
       </Row>
diff --git a/src/components/POLine/PaymentTerms/PaymentTermsForm/PaymentTermsForm.test.js b/src/components/POLine/PaymentTerms/PaymentTermsForm/PaymentTermsForm.test.js
index 935482dd4..4cd4004a7 100644
--- a/src/components/POLine/PaymentTerms/PaymentTermsForm/PaymentTermsForm.test.js
+++ b/src/components/POLine/PaymentTerms/PaymentTermsForm/PaymentTermsForm.test.js
@@ -153,16 +153,16 @@ describe('PaymentTermsForm', () => {
     expect(getDistributionProps().isAddFYButtonDisabled).toBe(true);
   });
 
-  it('should still pass a validate function to FiscalYearsDistribution when isTemplate is true', () => {
+  it('should not pass a validate function to FiscalYearsDistribution when isTemplate is true', () => {
     renderComponent({ isTemplate: true });
 
-    expect(getDistributionProps().validate).toEqual(expect.any(Function));
+    expect(getDistributionProps().validate).toBeUndefined();
   });
 
-  it('should still pass a validate function to FiscalYearsDistribution when multiYearPayment is false', () => {
+  it('should not pass a validate function to FiscalYearsDistribution when multiYearPayment is false', () => {
     renderComponent({}, { multiYearPayment: false });
 
-    expect(getDistributionProps().validate).toEqual(expect.any(Function));
+    expect(getDistributionProps().validate).toBeUndefined();
   });
 
   it('should pass isLoading=true to FiscalYearsDistribution', () => {