diff --git a/src/components/app-body/nfts-for-sale/index.js b/src/components/app-body/nfts-for-sale/index.js
index 72bd0a4..c3c1e0e 100644
--- a/src/components/app-body/nfts-for-sale/index.js
+++ b/src/components/app-body/nfts-for-sale/index.js
@@ -102,8 +102,6 @@ function NftsForSale (props) {
         if (tokenData) {
           // Set data to the token object , this can be used to display the token name in the token card component.
           thisToken.tokenData = tokenData
-          // Update the cache data  providing the tokenId to update and the data
-          appData.updateNFTCacheData(thisToken.tokenId, { tokenData })
         }
 
         // Mark token to prevent fetch token data again.
@@ -163,8 +161,6 @@ function NftsForSale (props) {
           // Set the icon url to the token , this can be used to display the icon in the token card component.
           thisToken.icon = iconUrl
           thisToken.tokenData.userData = userData
-          // Update the cache data  providing the tokenId to update and the data
-          appData.updateNFTCacheData(thisToken.tokenId, { tokenIcon: iconUrl })
         }
 
         // Mark token to prevent fetch token icon again.
@@ -177,14 +173,15 @@ function NftsForSale (props) {
     }
   }, [fetchTokenMutableData, appData])
 
-  // Load tokens data from the cache
-  const loadCacheData = useCallback(async (offers) => {
-    const cacheData = appData.nftForSaleData
+  //  Check if exiist token data in the cache and add it to the tokens object
+  const reviewNftCachedData = useCallback(async (offers) => {
+    const cacheData = appData.nftForSaleCacheData
     console.log(`Token data from cache: ${JSON.stringify(cacheData, null, 2)}`)
-    // Map all offers and add cache data to the offers if it exists
+    // Map all offers
     for (let i = 0; i < offers.length; i++) {
       const thisToken = offers[i]
       const cacheToken = cacheData[thisToken.tokenId]
+      // If cache data exists, add it to the token object
       if (cacheToken) {
         thisToken.tokenData = cacheToken.tokenData
         thisToken.icon = cacheToken.tokenIcon
@@ -192,6 +189,22 @@ function NftsForSale (props) {
     }
   }, [appData])
 
+  //  Check if exiist token data in the cache and add it to the tokens object
+  const updateNFTCachedData = useCallback(async (offers) => {
+    // Map all offers
+    for (let i = 0; i < offers.length; i++) {
+      const thisToken = offers[i]
+      // save token icon and token data in cache
+      const newTokenCacheData = {
+        tokenIcon: thisToken.icon,
+        tokenData: thisToken.tokenData
+      }
+
+      console.log('newTokenCacheData: ', newTokenCacheData)
+      appData.updateNFTCachedData(thisToken.tokenId, newTokenCacheData)
+    }
+  }, [appData])
+
   // Main function to load NFT offers
   const loadNftOffers = useCallback(async () => {
     try {
@@ -199,18 +212,23 @@ function NftsForSale (props) {
       // Get tokens in offers
       const offers = await getNftOffers()
       console.log('offers: ', offers)
-      await loadCacheData(offers)
+      // Review cached data to populate token data from cached data
+      await reviewNftCachedData(offers)
+      // set state to start displaying tokens cards.
       setOffers(offers)
-      // Load tokens data
+      // Load tokens data for  any updates to the token data
       await lazyLoadTokenData(offers)
-      // Load tokens icons
+      // Load tokens icons from mutable data
       await lazyLoadMutableData(offers)
+
+      //  Update cached data with the latest retrieved data
+      await updateNFTCachedData(offers)
       setIsLoading(false)
     } catch (err) {
       setIsLoading(false)
       console.error('Error loading NFT offers:', err)
     }
-  }, [lazyLoadTokenData, lazyLoadMutableData, getNftOffers, loadCacheData])
+  }, [lazyLoadTokenData, lazyLoadMutableData, getNftOffers, reviewNftCachedData, updateNFTCachedData])
 
   // Effect to load NFTs on component mount
   useEffect(() => {
diff --git a/src/hooks/state.js b/src/hooks/state.js
index 85c73b7..fbb3392 100644
--- a/src/hooks/state.js
+++ b/src/hooks/state.js
@@ -37,8 +37,8 @@ function useAppState () {
   const [hideSpinner, setHideSpinner] = useState(false)
   const [denyClose, setDenyClose] = useState(false)
 
-  // NFTs for sale state data
-  const [nftForSaleData, setNftForSaleData] = useState({})
+  // NFTs for sale stored data to improve performance
+  const [nftForSaleCacheData, setNftForSaleCacheData] = useState({})
 
   // The wallet state makes this a true progressive web app (PWA). As
   // balances, UTXOs, and tokens are retrieved, this state is updated.
@@ -100,14 +100,13 @@ function useAppState () {
   }
 
   // Update NFT for sale tokens data
-  function updateNFTCacheData (tokenId, data) {
-    const allCacheData = nftForSaleData // Get all cache data
+  function updateNFTCachedData (tokenId, data) {
+    const allCacheData = nftForSaleCacheData // Get all cache data
     const cacheData = allCacheData[tokenId] || {} // Get cache data for the tokenId
 
     const newCacheData = Object.assign({}, cacheData, data) // Merge the new data with the cache data
-    console.log('newCacheData: ', newCacheData)
     allCacheData[tokenId] = newCacheData // Update the cache data
-    setNftForSaleData(allCacheData) // Update the state
+    setNftForSaleCacheData(allCacheData) // Update the state
   }
 
   return {
@@ -146,9 +145,9 @@ function useAppState () {
     setDexLib,
     nostr,
     setNostr,
-    nftForSaleData,
-    setNftForSaleData,
-    updateNFTCacheData
+    nftForSaleCacheData,
+    setNftForSaleCacheData,
+    updateNFTCachedData
   }
 }