diff --git a/client/src/containers/Purchases/Bills/BillForm/BillFormProvider.js b/client/src/containers/Purchases/Bills/BillForm/BillFormProvider.js
index 7c74c3581..401ea1622 100644
--- a/client/src/containers/Purchases/Bills/BillForm/BillFormProvider.js
+++ b/client/src/containers/Purchases/Bills/BillForm/BillFormProvider.js
@@ -17,12 +17,12 @@ const BillFormContext = createContext();
  */
 function BillFormProvider({ billId, ...props }) {
   // Handle fetch accounts.
-  const { data: accounts, isFetching: isAccountsLoading } = useAccounts();
+  const { data: accounts, isLoading: isAccountsLoading } = useAccounts();
 
   // Handle fetch vendors data table
   const {
     data: { vendors },
-    isFetching: isVendorsLoading,
+    isLoading: isVendorsLoading,
   } = useVendors({ page_size: 10000 });
 
   // Filter all purchasable items only.
@@ -38,14 +38,14 @@ function BillFormProvider({ billId, ...props }) {
   // Handle fetch Items data table or list
   const {
     data: { items },
-    isFetching: isItemsLoading,
+    isLoading: isItemsLoading,
   } = useItems({
     page_size: 10000,
     stringified_filter_roles: stringifiedFilterRoles,
   });
 
   // Handle fetch bill details.
-  const { data: bill, isFetching: isBillLoading } = useBill(billId, {
+  const { data: bill, isLoading: isBillLoading } = useBill(billId, {
     enabled: !!billId,
   });
 
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormProvider.js b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormProvider.js
index 2ac1deaee..ed3afd8fd 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormProvider.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormProvider.js
@@ -86,7 +86,6 @@ function PaymentMadeFormProvider({ paymentMadeId, ...props }) {
         isVendorsLoading ||
         isItemsFetching ||
         isAccountsLoading ||
-        isPaymentFetching ||
         isPaymentLoading
       }
       name={'payment-made'}
diff --git a/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormProvider.js b/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormProvider.js
index 29ab728ed..4aa758963 100644
--- a/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormProvider.js
+++ b/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormProvider.js
@@ -17,19 +17,19 @@ const ReceiptFormContext = createContext();
  */
 function ReceiptFormProvider({ receiptId, ...props }) {
   // Fetch sale receipt details.
-  const { data: receipt, isFetching: isReceiptLoading } = useReceipt(
+  const { data: receipt, isLoading: isReceiptLoading } = useReceipt(
     receiptId,
     {
       enabled: !!receiptId,
     },
   );
   // Fetch accounts list.
-  const { data: accounts, isFetching: isAccountsLoading } = useAccounts();
+  const { data: accounts, isLoading: isAccountsLoading } = useAccounts();
 
   // Fetch customers list.
   const {
     data: { customers },
-    isFetching: isCustomersLoading,
+    isLoading: isCustomersLoading,
   } = useCustomers({ page_size: 10000 });
 
   // Filter all sellable items only.
@@ -45,7 +45,7 @@ function ReceiptFormProvider({ receiptId, ...props }) {
   // Handle fetch Items data table or list
   const {
     data: { items },
-    isFetching: isItemsLoading,
+    isLoading: isItemsLoading,
   } = useItems({
     page_size: 10000,
     stringified_filter_roles: stringifiedFilterRoles,