diff --git a/src/components/tst-staking/StakingSummary.jsx b/src/components/tst-staking/StakingSummary.jsx
index 25736a1..68b9790 100644
--- a/src/components/tst-staking/StakingSummary.jsx
+++ b/src/components/tst-staking/StakingSummary.jsx
@@ -256,9 +256,6 @@ const StakingSummary = ({
 
   const monthlyProjection = (dailyEarnings * 30) || 0;
 
-  console.log(123123, {dailyEarnings}, {daysStaked})
-
-
   const currentTier = getCurrentTier(stakedAmount);
   const nextTier = getNextTier(stakedAmount);
 
diff --git a/src/components/vault/yield/YieldList.jsx b/src/components/vault/yield/YieldList.jsx
index fe4ee67..0be226d 100644
--- a/src/components/vault/yield/YieldList.jsx
+++ b/src/components/vault/yield/YieldList.jsx
@@ -31,6 +31,10 @@ const YieldList = (props) => {
     gammaUserLoading,
     gammaReturnsLoading,
     gammaStatsLoading,
+    gammaUserErr,
+    gammaReturnsErr,
+    gammaStatsErr,
+    gammaUnavailableMsg,
   } = props;
 
   const [ open, setOpen ] = useState('');
@@ -57,6 +61,8 @@ const YieldList = (props) => {
   ? SepoliaVaults
   : ArbitrumVaults;
 
+  const hasAPIErr = gammaUserErr || gammaReturnsErr || gammaStatsErr;
+
   return (
     <div className="">
       <Typography variant="h2" className="card-title flex gap-0">
@@ -65,6 +71,9 @@ const YieldList = (props) => {
         />
         Yield Pools
       </Typography>
+      {hasAPIErr ? (
+        gammaUnavailableMsg()
+      ) : null}
       <table className="table">
         <thead>
           <tr>
@@ -208,6 +217,8 @@ const YieldList = (props) => {
         gammaUserLoading={gammaUserLoading}
         gammaReturnsLoading={gammaReturnsLoading}
         gammaStatsLoading={gammaStatsLoading}
+        hasAPIErr={hasAPIErr}
+        gammaUnavailableMsg={gammaUnavailableMsg}
       />
     </div>
   );
diff --git a/src/components/vault/yield/YieldParent.jsx b/src/components/vault/yield/YieldParent.jsx
index c75e604..a579f4e 100644
--- a/src/components/vault/yield/YieldParent.jsx
+++ b/src/components/vault/yield/YieldParent.jsx
@@ -28,12 +28,16 @@ const YieldParent = (props) => {
   const { smartVaultABI } = useSmartVaultABIStore();
   const [ gammaUser, setGammaUser ] = useState({});
   const [ gammaUserLoading, setGammaUserLoading ] = useState(false);
+  const [ gammaUserErr, setGammaUserErr ] = useState(false);
   const [ gammaReturns, setGammaReturns ] = useState([]);
   const [ gammaReturnsLoading, setGammaReturnsLoading ] = useState(false);
+  const [ gammaReturnsErr, setGammaReturnsErr ] = useState(false);
   const [ gammaStats, setGammaStats ] = useState([]);
   const [ gammaStatsLoading, setGammaStatsLoading ] = useState(false);
+  const [ gammaStatsErr, setGammaStatsErr ] = useState(false);
   const [ merklRewards, setMerklRewards ] = useState([]);
   const [ merklRewardsLoading, setMerklRewardsLoading ] = useState(true);
+  const [ merklRewardsErr, setMerklRewardsErr ] = useState(false);
 
   const [ userSummary, setUserSummary ] = useState([]);
 
@@ -93,8 +97,10 @@ const YieldParent = (props) => {
 
       setMerklRewards(rewardsArray);
       setMerklRewardsLoading(false);
+      setMerklRewardsErr(false);
     } catch (error) {
       setMerklRewardsLoading(false);
+      setMerklRewardsErr(true);
       console.log(error);
     }
   };
@@ -110,8 +116,10 @@ const YieldParent = (props) => {
 
       setGammaUser(useData);
       setGammaUserLoading(false);
+      setGammaUserErr(false);
     } catch (error) {
       setGammaUserLoading(false);
+      setGammaUserErr(true);
       console.log(error);
     }
   };
@@ -137,8 +145,10 @@ const YieldParent = (props) => {
 
       setGammaReturns(hypervisorReturns);
       setGammaReturnsLoading(false);
+      setGammaReturnsErr(true);
     } catch (error) {
       setGammaReturnsLoading(false);
+      setGammaReturnsErr(true);
       console.log(error);
     }
   };
@@ -164,8 +174,10 @@ const YieldParent = (props) => {
 
       setGammaStats(hypervisorStats);
       setGammaStatsLoading(false);
+      setGammaStatsErr(false);
     } catch (error) {
       setGammaStatsLoading(false);
+      setGammaStatsErr(true);
       console.log(error);
     }
   };
@@ -223,6 +235,21 @@ const YieldParent = (props) => {
     })
   };
 
+  const gammaUnavailableMsg = () => {
+    return (
+      <>
+        <div className="bg-amber-600/40 p-4 rounded-lg w-full flex flex-col">
+          <Typography variant="p">
+            <b>3rd Party API Not Responding</b>
+          </Typography>
+          <Typography variant="p">
+            This may prevent us from displaying some blockchain data.
+          </Typography>
+        </div>
+      </>
+    )
+  }
+
   return (
     <div className="flex-1 grow-[3]">
       {yieldEnabled ? (
@@ -240,6 +267,10 @@ const YieldParent = (props) => {
                     gammaUserLoading={gammaUserLoading}
                     gammaReturnsLoading={gammaReturnsLoading}
                     gammaStatsLoading={gammaStatsLoading}
+                    gammaUserErr={gammaUserErr}
+                    gammaReturnsErr={gammaReturnsErr}
+                    gammaStatsErr={gammaStatsErr}
+                    gammaUnavailableMsg={gammaUnavailableMsg}
                   />
                 </div>
               </Card>
@@ -251,6 +282,9 @@ const YieldParent = (props) => {
                     userSummary={userSummary}
                     merklRewards={merklRewards}
                     merklRewardsLoading={merklRewardsLoading}
+                    gammaUserErr={gammaUserErr}
+                    merklRewardsErr={merklRewardsErr}
+                    gammaUnavailableMsg={gammaUnavailableMsg}
                   />
                 </div>
               </Card>
diff --git a/src/components/vault/yield/YieldPerformanceModal.jsx b/src/components/vault/yield/YieldPerformanceModal.jsx
index 6a0916b..0574ee8 100644
--- a/src/components/vault/yield/YieldPerformanceModal.jsx
+++ b/src/components/vault/yield/YieldPerformanceModal.jsx
@@ -34,6 +34,8 @@ const YieldPerformanceModal = ({
   gammaUserLoading,
   gammaReturnsLoading,
   gammaStatsLoading,
+  hasAPIErr,
+  gammaUnavailableMsg,
 }) => {
 
   const positionUser = gammaUser?.[yieldHypervisor.toLowerCase()] || {};
@@ -143,7 +145,11 @@ const YieldPerformanceModal = ({
             </Typography>
           </div>
           <div>
-
+            {hasAPIErr ? (
+              <div className="mb-4">
+                {gammaUnavailableMsg()}
+              </div>
+            ) : null}
             <div className="grid grid-cols-2 gap-4 mb-4">
               <div className="bg-base-300/40 p-4 rounded-lg w-full">
                 <Typography variant="p">
diff --git a/src/components/vault/yield/YieldSummary.jsx b/src/components/vault/yield/YieldSummary.jsx
index c8a3a95..212bf4c 100644
--- a/src/components/vault/yield/YieldSummary.jsx
+++ b/src/components/vault/yield/YieldSummary.jsx
@@ -32,6 +32,9 @@ const YieldSummary = ({
   userSummary,
   merklRewards,
   merklRewardsLoading,
+  gammaUserErr,
+  merklRewardsErr,
+  gammaUnavailableMsg,
 }) => {
   const { merklRewardsUSD } = useMerklRewardsUSD();
 
@@ -144,6 +147,8 @@ const YieldSummary = ({
 
   const metrics = calculateMetrics(positions);
 
+  const hasAPIErr = gammaUserErr || merklRewardsErr;
+
   return (
     <>
 
@@ -159,6 +164,9 @@ const YieldSummary = ({
             {getPerformanceMessage(metrics.totalYieldEarned, metrics.totalMarketYield)}
           </Typography>
         </div>
+        {hasAPIErr ? (
+          gammaUnavailableMsg()
+        ) : null}
         <div className="bg-base-300/40 p-4 rounded-lg w-full flex items-center">
           <div className="w-full">
             <Typography variant="p">