diff --git a/client/src/containers/Purchases/Bill/BillForm.js b/client/src/containers/Purchases/Bill/BillForm.js
index 47c800e5a..087fea249 100644
--- a/client/src/containers/Purchases/Bill/BillForm.js
+++ b/client/src/containers/Purchases/Bill/BillForm.js
@@ -117,7 +117,7 @@ function BillForm({
             then: Yup.number().required(),
           }),
         total: Yup.number().nullable(),
-        discount: Yup.number().nullable(),
+        discount: Yup.number().nullable().min(0).max(100),
         description: Yup.string().nullable(),
       }),
     ),
@@ -207,7 +207,6 @@ function BillForm({
   };
 
   const formik = useFormik({
-    // enableReinitialize: true,
     validationSchema,
     initialValues: {
       ...initialValues,
diff --git a/client/src/containers/Sales/Estimate/EstimateForm.js b/client/src/containers/Sales/Estimate/EstimateForm.js
index 7fbc8a5d6..db3c514e9 100644
--- a/client/src/containers/Sales/Estimate/EstimateForm.js
+++ b/client/src/containers/Sales/Estimate/EstimateForm.js
@@ -129,7 +129,7 @@ const EstimateForm = ({
             is: (quantity, rate) => quantity || rate,
             then: Yup.number().required(),
           }),
-        discount: Yup.number().nullable(),
+        discount: Yup.number().nullable().min(0).max(100),
         description: Yup.string().nullable(),
       }),
     ),
diff --git a/client/src/containers/Sales/Invoice/InvoiceForm.js b/client/src/containers/Sales/Invoice/InvoiceForm.js
index 65695d63b..a62200650 100644
--- a/client/src/containers/Sales/Invoice/InvoiceForm.js
+++ b/client/src/containers/Sales/Invoice/InvoiceForm.js
@@ -128,7 +128,7 @@ function InvoiceForm({
             is: (quantity, rate) => quantity || rate,
             then: Yup.number().required(),
           }),
-        discount: Yup.number().nullable(),
+          discount: Yup.number().nullable().min(0).max(100),
         description: Yup.string().nullable(),
       }),
     ),
diff --git a/client/src/containers/Sales/Receipt/ReceiptForm.js b/client/src/containers/Sales/Receipt/ReceiptForm.js
index 41bb06cce..eeb3afc7d 100644
--- a/client/src/containers/Sales/Receipt/ReceiptForm.js
+++ b/client/src/containers/Sales/Receipt/ReceiptForm.js
@@ -129,7 +129,7 @@ function ReceiptForm({
             is: (quantity, rate) => quantity || rate,
             then: Yup.number().required(),
           }),
-        discount: Yup.number().nullable(),
+        discount: Yup.number().nullable().min(0).max(100),
         description: Yup.string().nullable(),
       }),
     ),
@@ -383,9 +383,9 @@ function ReceiptForm({
 
 export default compose(
   withReceiptActions,
+  withReceiptDetail(),
   withDashboardActions,
   withMediaActions,
-  withReceiptDetail(),
   withSettings(({ receiptSettings }) => ({
     receiptNextNumber: receiptSettings?.nextNumber,
     receiptNumberPrefix: receiptSettings?.numberPrefix,