diff --git a/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.js b/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.js
index 36e9ef57f..d088813e5 100644
--- a/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.js
+++ b/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.js
@@ -156,7 +156,7 @@ function QuickPaymentMadeFormFields({
         {/*------------ exchange rate -----------*/}
         <ExchangeRateMutedField
           name={'exchange_rate'}
-          fromCurrency={baseCurrency}
+          fromCurrency={base_currency}
           toCurrency={values.currency_code}
           formGroupProps={{ label: '', inline: false }}
           date={values.payment_date}
diff --git a/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.js b/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.js
index 82859d7d3..7293f717f 100644
--- a/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.js
+++ b/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.js
@@ -161,7 +161,7 @@ function QuickPaymentReceiveFormFields({
         {/*------------ exchange rate -----------*/}
         <ExchangeRateMutedField
           name={'exchange_rate'}
-          fromCurrency={baseCurrency}
+          fromCurrency={base_currency}
           toCurrency={values.currency_code}
           formGroupProps={{ label: '', inline: false }}
           date={values.payment_date}
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersListProvider.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersListProvider.js
index 017341b6c..5d608ad12 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersListProvider.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersListProvider.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import { isEmpty } from 'lodash';
-
+import { Features } from 'common';
 import DashboardInsider from 'components/Dashboard/DashboardInsider';
+import { useFeatureCan } from 'hooks/state';
 import {
   useResourceViews,
   useResourceMeta,
@@ -24,16 +25,26 @@ function WarehouseTransfersListProvider({
   // warehouse transfers refresh action.
   const { refresh } = useRefreshWarehouseTransfers();
 
+  // Features guard.
+  const { featureCan } = useFeatureCan();
+
+  const isWarehouseFeatureCan = featureCan(Features.Warehouses);
+
   // Fetch warehouse transfers list according to the given custom view id.
   const {
     data: { warehousesTransfers, pagination, filterMeta },
     isFetching: isWarehouseTransfersFetching,
     isLoading: isWarehouseTransfersLoading,
-  } = useWarehousesTransfers(query, { keepPreviousData: true });
+  } = useWarehousesTransfers(
+    query,
+    // { keepPreviousData: true },
+    { enabled: isWarehouseFeatureCan },
+  );
 
   // Detarmines the datatable empty status.
   const isEmptyStatus =
-    isEmpty(warehousesTransfers) && !isWarehouseTransfersLoading;
+    (isEmpty(warehousesTransfers) && !isWarehouseTransfersLoading) ||
+    !isWarehouseFeatureCan;
 
   // Fetch create notes resource views and fields.
   const { data: WarehouseTransferView, isLoading: isViewsLoading } =