diff --git a/src/components/NftCard.tsx b/src/components/NftCard.tsx
index 9cad5d67..a5cab96b 100644
--- a/src/components/NftCard.tsx
+++ b/src/components/NftCard.tsx
@@ -571,7 +571,9 @@ export const NftCard = memo(NftCardComponent, (prevProps, nextProps) => {
   // Only re-render if these props change
   return (
     prevProps.nft.launcher_id === nextProps.nft.launcher_id &&
+    prevProps.nft.created_height === nextProps.nft.created_height &&
     prevProps.nft.visible === nextProps.nft.visible &&
-    prevProps.selectionState?.[0] === nextProps.selectionState?.[0]
+    prevProps.selectionState?.[0] === nextProps.selectionState?.[0] &&
+    prevProps.nft.coin_id === nextProps.nft.coin_id
   );
 });
diff --git a/src/components/NftCardList.tsx b/src/components/NftCardList.tsx
index c0186748..7e0f8693 100644
--- a/src/components/NftCardList.tsx
+++ b/src/components/NftCardList.tsx
@@ -155,10 +155,10 @@ export function NftCardList({
       );
     }
 
-    return nfts.map((nft, i) => (
+    return nfts.map((nft) => (
       <NftCard
         nft={nft}
-        key={i}
+        key={nft.coin_id}
         updateNfts={() => updateNfts(page)}
         selectionState={
           multiSelect