diff --git a/pages/reserve-overview.page.tsx b/pages/reserve-overview.page.tsx
index eb3d7467b1..bcc9b2a507 100644
--- a/pages/reserve-overview.page.tsx
+++ b/pages/reserve-overview.page.tsx
@@ -5,11 +5,7 @@ import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
 import StyledToggleButton from 'src/components/StyledToggleButton';
 import StyledToggleButtonGroup from 'src/components/StyledToggleButtonGroup';
-import {
-  ComputedReserveData,
-  ReserveWithId,
-  useAppDataContext,
-} from 'src/hooks/app-data-provider/useAppDataProvider';
+import { useAppDataContext } from 'src/hooks/app-data-provider/useAppDataProvider';
 import { AssetCapsProvider } from 'src/hooks/useAssetCaps';
 import { AssetCapsProviderSDK } from 'src/hooks/useAssetCapsSDK';
 import { MainLayout } from 'src/layouts/MainLayout';
@@ -55,12 +51,12 @@ export default function ReserveOverview() {
   //With SDK
   const reserve = supplyReserves.find((reserve) => {
     return reserve.underlyingToken.address.toLowerCase() === underlyingAsset?.toLowerCase();
-  }) as ReserveWithId;
+  });
 
   //With Reserves
   const reserveLegacy = reserves.find((reserve) => {
     return reserve.underlyingAsset.toLowerCase() === underlyingAsset?.toLowerCase();
-  }) as ComputedReserveData;
+  });
   const [pageEventCalled, setPageEventCalled] = useState(false);
 
   useEffect(() => {
@@ -76,6 +72,15 @@ export default function ReserveOverview() {
 
   const isOverview = mode === 'overview';
 
+  // Don't render reserve configuration until SDK data is loaded
+  if (!reserve || !reserveLegacy) {
+    return (
+      <>
+        <ReserveTopDetailsWrapper underlyingAsset={underlyingAsset} />
+      </>
+    );
+  }
+
   return (
     <AssetCapsProviderSDK asset={reserve}>
       <ReserveTopDetailsWrapper underlyingAsset={underlyingAsset} />
diff --git a/src/modules/markets/MarketAssetsListItem.tsx b/src/modules/markets/MarketAssetsListItem.tsx
index f4fce15f03..d81c304fd0 100644
--- a/src/modules/markets/MarketAssetsListItem.tsx
+++ b/src/modules/markets/MarketAssetsListItem.tsx
@@ -164,7 +164,7 @@ export const MarketAssetsListItem = ({ ...reserve }: ReserveWithProtocolIncentiv
         {reserve.borrowInfo?.borrowingState === 'DISABLED' &&
           !reserve.isFrozen &&
           !reserve.eModeInfo?.some((eMode) => eMode.canBeBorrowed) &&
-          reserve.borrowInfo.total.amount.value !== '0' && <ReserveSubheader value={'Disabled'} />}
+          reserve.borrowInfo?.total.amount.value !== '0' && <ReserveSubheader value={'Disabled'} />}
       </ListColumn>
 
       <ListColumn minWidth={95} maxWidth={95} align="right">
diff --git a/src/modules/markets/MarketAssetsListMobileItem.tsx b/src/modules/markets/MarketAssetsListMobileItem.tsx
index 41e5325b7f..fcc9760a0f 100644
--- a/src/modules/markets/MarketAssetsListMobileItem.tsx
+++ b/src/modules/markets/MarketAssetsListMobileItem.tsx
@@ -161,7 +161,7 @@ export const MarketAssetsListMobileItem = ({ ...reserve }: ReserveWithProtocolIn
         {reserve.borrowInfo?.borrowingState === 'DISABLED' &&
           !reserve.isFrozen &&
           !reserve.eModeInfo?.some((eMode) => eMode.canBeBorrowed) &&
-          reserve.borrowInfo.total.amount.value !== '0' && <ReserveSubheader value={'Disabled'} />}
+          reserve.borrowInfo?.total.amount.value !== '0' && <ReserveSubheader value={'Disabled'} />}
       </Row>
       <Button
         variant="outlined"