diff --git a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.js b/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.js
index ecaa99018..d1dd532ca 100644
--- a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.js
+++ b/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.js
@@ -25,10 +25,7 @@ export default function InvoiceFloatingActions() {
   const history = useHistory();
 
   // Formik context.
-  const { isSubmitting } = useFormikContext();
-
-  // Formik context.
-  const { resetForm, submitForm } = useFormikContext();
+  const { resetForm, submitForm, isSubmitting } = useFormikContext();
 
   // Invoice form context.
   const { setSubmitPayload, invoice } = useInvoiceFormContext();
diff --git a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js b/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js
index 11d4d3371..f67a7dc52 100644
--- a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js
+++ b/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js
@@ -177,7 +177,7 @@ export default compose(
   withSettings(({ invoiceSettings }) => ({
     invoiceNextNumber: invoiceSettings?.nextNumber,
     invoiceNumberPrefix: invoiceSettings?.numberPrefix,
-    invoiceIncrementMode: invoiceSettings?.incrementMode,
+    invoiceIncrementMode: invoiceSettings?.autoIncrement,
   })),
   withCurrentOrganization(),
 )(InvoiceForm);