diff --git a/src/modules/reserve-overview/ReserveConfiguration.tsx b/src/modules/reserve-overview/ReserveConfiguration.tsx
index 2685b3e87c..2c1bb20aa3 100644
--- a/src/modules/reserve-overview/ReserveConfiguration.tsx
+++ b/src/modules/reserve-overview/ReserveConfiguration.tsx
@@ -26,7 +26,6 @@ import { ReserveFactorOverview } from 'src/modules/reserve-overview/ReserveFacto
 
 import LightningBoltGradient from '/public/lightningBoltGradient.svg';
 
-import { CustomMarket, marketsData } from '../../utils/marketsAndNetworksConfig';
 import { ApyGraphContainer } from './graphs/ApyGraphContainer';
 import { InterestRateModelGraphContainer } from './graphs/InterestRateModelGraphContainer';
 import { PanelItem, PanelRow, PanelTitle } from './ReservePanels';
@@ -37,10 +36,7 @@ type ReserveConfigurationProps = {
 
 export const ReserveConfiguration: React.FC<ReserveConfigurationProps> = ({ reserve }) => {
   const { currentNetworkConfig, currentMarketData, currentMarket } = useProtocolDataContext();
-  const { v3 } = marketsData[currentMarket as CustomMarket];
-  // V3 and V2 Polygon will be enabled once support is added to API
-  const renderCharts =
-    !v3 && !!currentNetworkConfig.ratesHistoryApiUrl && currentMarket !== 'proto_polygon';
+  const renderCharts = !!currentNetworkConfig.ratesHistoryApiUrl;
   const { supplyCap, borrowCap, debtCeiling } = useAssetCaps();
   const showSupplyCapStatus = reserve.supplyCap && reserve.supplyCap !== '0';
   const showBorrowCapStatus = reserve.borrowCap && reserve.borrowCap !== '0';
@@ -196,7 +192,7 @@ export const ReserveConfiguration: React.FC<ReserveConfigurationProps> = ({ rese
             <ApyGraphContainer
               graphKey="supply"
               reserve={reserve}
-              lendingPoolAddressProvider={currentMarketData.addresses.LENDING_POOL_ADDRESS_PROVIDER}
+              currentMarketData={currentMarketData}
             />
           )}
           <div>
@@ -475,9 +471,7 @@ export const ReserveConfiguration: React.FC<ReserveConfigurationProps> = ({ rese
                 <ApyGraphContainer
                   graphKey="borrow"
                   reserve={reserve}
-                  lendingPoolAddressProvider={
-                    currentMarketData.addresses.LENDING_POOL_ADDRESS_PROVIDER
-                  }
+                  currentMarketData={currentMarketData}
                 />
               )}
               <Box
diff --git a/src/modules/reserve-overview/graphs/ApyGraphContainer.tsx b/src/modules/reserve-overview/graphs/ApyGraphContainer.tsx
index 3b925ce488..46f4422e0b 100644
--- a/src/modules/reserve-overview/graphs/ApyGraphContainer.tsx
+++ b/src/modules/reserve-overview/graphs/ApyGraphContainer.tsx
@@ -4,6 +4,7 @@ import { ParentSize } from '@visx/responsive';
 import { useState } from 'react';
 import type { ComputedReserveData } from 'src/hooks/app-data-provider/useAppDataProvider';
 import { ReserveRateTimeRange, useReserveRatesHistory } from 'src/hooks/useReservesHistory';
+import { MarketDataType } from 'src/utils/marketsAndNetworksConfig';
 
 import { ApyGraph } from './ApyGraph';
 import { GraphLegend } from './GraphLegend';
@@ -18,7 +19,7 @@ type ApyGraphContainerKey = 'supply' | 'borrow';
 type ApyGraphContainerProps = {
   graphKey: ApyGraphContainerKey;
   reserve: ComputedReserveData;
-  lendingPoolAddressProvider: string;
+  currentMarketData: MarketDataType;
 };
 
 /**
@@ -31,13 +32,20 @@ type ApyGraphContainerProps = {
 export const ApyGraphContainer = ({
   graphKey,
   reserve,
-  lendingPoolAddressProvider,
+  currentMarketData,
 }: ApyGraphContainerProps): JSX.Element => {
   const [selectedTimeRange, setSelectedTimeRange] = useState<ReserveRateTimeRange>('1m');
 
   const CHART_HEIGHT = 155;
   const CHART_HEIGHT_LOADING_FIX = 3.5;
-  const reserveAddress = reserve ? `${reserve.underlyingAsset}${lendingPoolAddressProvider}` : '';
+  let reserveAddress = '';
+  if (reserve) {
+    if (currentMarketData.v3) {
+      reserveAddress = `${reserve.underlyingAsset}${currentMarketData.addresses.LENDING_POOL_ADDRESS_PROVIDER}${currentMarketData.chainId}`;
+    } else {
+      reserveAddress = `${reserve.underlyingAsset}${currentMarketData.addresses.LENDING_POOL_ADDRESS_PROVIDER}`;
+    }
+  }
   const { data, loading, error, refetch } = useReserveRatesHistory(
     reserveAddress,
     selectedTimeRange
diff --git a/src/ui-config/networksConfig.ts b/src/ui-config/networksConfig.ts
index 486c98df12..c4100ec369 100644
--- a/src/ui-config/networksConfig.ts
+++ b/src/ui-config/networksConfig.ts
@@ -198,6 +198,7 @@ export const networkConfigs: Record<string, BaseNetworkConfig> = {
       name: 'Arbitrum Bridge',
       url: 'https://bridge.arbitrum.io',
     },
+    ratesHistoryApiUrl: 'https://aave-api-v2.aave.com/data/rates-history',
   },
   [ChainId.harmony]: {
     name: 'Harmony',
@@ -218,6 +219,7 @@ export const networkConfigs: Record<string, BaseNetworkConfig> = {
       name: 'Harmony Bridge',
       url: 'https://bridge.harmony.one',
     },
+    ratesHistoryApiUrl: 'https://aave-api-v2.aave.com/data/rates-history',
   },
   [ChainId.optimism]: {
     name: 'Optimism',
@@ -239,6 +241,7 @@ export const networkConfigs: Record<string, BaseNetworkConfig> = {
       name: 'Optimism Bridge',
       url: 'https://app.optimism.io/bridge',
     },
+    ratesHistoryApiUrl: 'https://aave-api-v2.aave.com/data/rates-history',
   },
   [ChainId.optimism_goerli]: {
     name: 'Optimism Görli',
@@ -279,6 +282,7 @@ export const networkConfigs: Record<string, BaseNetworkConfig> = {
       name: 'Fantom Bridge',
       url: 'https://app.multichain.org/#/router',
     },
+    ratesHistoryApiUrl: 'https://aave-api-v2.aave.com/data/rates-history',
   },
   [ChainId.fantom_testnet]: {
     name: 'Fantom Testnet',