diff --git a/apps/frontend/src/components/MarketsView/MarketCollateralsTable.tsx b/apps/frontend/src/components/MarketsView/MarketCollateralsTable.tsx
index 644f4a1d..d37cd71c 100644
--- a/apps/frontend/src/components/MarketsView/MarketCollateralsTable.tsx
+++ b/apps/frontend/src/components/MarketsView/MarketCollateralsTable.tsx
@@ -98,7 +98,6 @@ export const MarketCollateralsTable = ({
 }: { marketName: string }) => {
   const { data: collateralConfigurations } =
     useCollateralConfigurations(marketName);
-  const { data: marketConfiguration } = useMarketConfiguration(marketName);
 
   const collaterals = useMemo(() => {
     if (!collateralConfigurations) return [];
diff --git a/apps/frontend/src/components/MarketsView/MarketOverview.tsx b/apps/frontend/src/components/MarketsView/MarketOverview.tsx
index c28ab8fe..10f55aaa 100644
--- a/apps/frontend/src/components/MarketsView/MarketOverview.tsx
+++ b/apps/frontend/src/components/MarketsView/MarketOverview.tsx
@@ -50,7 +50,7 @@ export default function MarketOverview({
 }: MarketOverviewProps) {
   const { data: totalReserves } = useTotalReserves(baseAsset);
 
-  const { data: aprData, isPending: isAprPending } = useApr();
+  const { data: aprData, isPending: isAprPending } = useApr(baseAsset);
 
   const { data: collateralConfigurations } =
     useCollateralConfigurations(baseAsset);
diff --git a/apps/frontend/src/components/MarketsView/MarketTableRow.tsx b/apps/frontend/src/components/MarketsView/MarketTableRow.tsx
index c7fa0677..724640bb 100644
--- a/apps/frontend/src/components/MarketsView/MarketTableRow.tsx
+++ b/apps/frontend/src/components/MarketsView/MarketTableRow.tsx
@@ -74,7 +74,7 @@ export const MarketTableRow = ({
   const { data: marketConfiguration } = useMarketConfiguration();
 
   const { data: utilization } = useUtilization(marketName);
-  const { data: aprData, isPending: isAprPending } = useApr();
+  const { data: aprData, isPending: isAprPending } = useApr(marketName);
 
   const {
     data: collateralConfigurations,
@@ -119,7 +119,7 @@ export const MarketTableRow = ({
     );
   }, [totalCollateral, priceData]);
 
-  return isPendingCollateralConfigurations ? (
+  return isPendingCollateralConfigurations || isAprPending ? (
     SkeletonRow
   ) : (
     <TableRow
diff --git a/apps/frontend/src/configs/envs/testnet.ts b/apps/frontend/src/configs/envs/testnet.ts
index f8222a55..5a291c4a 100644
--- a/apps/frontend/src/configs/envs/testnet.ts
+++ b/apps/frontend/src/configs/envs/testnet.ts
@@ -35,9 +35,9 @@ export function createTestnetConfig() {
 const rewards: Rewards = {
   USDC: [
     {
-      poolSize: 2000000,
+      poolSize: 200,
       assetId:
-        '0x1d5d97005e41cae2187a895fd8eab0506111e0e2f3331cd3912c15c24e3c1d82',
+        '0x3aced3c270121c9d85e00fb14f079ecc666b733b12a0d15df1c2ecae26c1167a',
       supplyRewardPercentage: 0.5,
       borrowRewardPercentage: 0.5,
       startDate: '2025-01-07T00:00:00Z',
@@ -45,9 +45,9 @@ const rewards: Rewards = {
       durationInDays: 7,
     },
     {
-      poolSize: 4000000,
+      poolSize: 400,
       assetId:
-        '0x1d5d97005e41cae2187a895fd8eab0506111e0e2f3331cd3912c15c24e3c1d82',
+        '0x3aced3c270121c9d85e00fb14f079ecc666b733b12a0d15df1c2ecae26c1167a',
       supplyRewardPercentage: 0.5,
       borrowRewardPercentage: 0.5,
       startDate: '2025-01-14T00:00:00Z',
@@ -55,9 +55,9 @@ const rewards: Rewards = {
       durationInDays: 7,
     },
     {
-      poolSize: 8000000,
+      poolSize: 800,
       assetId:
-        '0x1d5d97005e41cae2187a895fd8eab0506111e0e2f3331cd3912c15c24e3c1d82',
+        '0x3aced3c270121c9d85e00fb14f079ecc666b733b12a0d15df1c2ecae26c1167a',
       supplyRewardPercentage: 0.5,
       borrowRewardPercentage: 0.5,
       startDate: '2025-01-21T00:00:00Z',
@@ -67,9 +67,9 @@ const rewards: Rewards = {
   ],
   USDT: [
     {
-      poolSize: 2000000,
+      poolSize: 200,
       assetId:
-        '0x1d5d97005e41cae2187a895fd8eab0506111e0e2f3331cd3912c15c24e3c1d82',
+        '0xc264acd28eaf6f33e0e13360a37741dc91221aaa8817e1b4e462d61bb08c5835',
       supplyRewardPercentage: 0.5,
       borrowRewardPercentage: 0.5,
       startDate: '2025-01-11T00:00:00Z',