diff --git a/src/components/CCIP/ChainHero/ChainHero.tsx b/src/components/CCIP/ChainHero/ChainHero.tsx
index fae27ddaf16..344a5078488 100644
--- a/src/components/CCIP/ChainHero/ChainHero.tsx
+++ b/src/components/CCIP/ChainHero/ChainHero.tsx
@@ -85,12 +85,14 @@ function ChainHero({ chains, tokens, network, token, environment, lanes }: Chain
       tokenId: feeToken,
     })
     const explorer = network.explorer
-    const address = getExplorerAddressUrl(explorer)(token[network.chain].tokenAddress)
+    const address = token[network.chain].tokenAddress
+    const contractUrl = getExplorerAddressUrl(explorer)(token[network.chain].tokenAddress)
 
     return {
       logo,
       token: feeToken,
       address,
+      contractUrl,
     }
   })
 
@@ -150,7 +152,7 @@ function ChainHero({ chains, tokens, network, token, environment, lanes }: Chain
             <div className="ccip-chain-hero__details__item">
               <div className="ccip-chain-hero__details__label">Router</div>
               <div className="ccip-chain-hero__details__value" data-clipboard-type="router">
-                <Address endLength={4} contractUrl={network.routerExplorerUrl} />
+                <Address endLength={4} contractUrl={network.routerExplorerUrl} address={network.router?.address} />
               </div>
             </div>
             <div className="ccip-chain-hero__details__item">
@@ -194,6 +196,7 @@ function ChainHero({ chains, tokens, network, token, environment, lanes }: Chain
                   <Address
                     endLength={4}
                     contractUrl={getExplorerAddressUrl(network.explorer)(network.armProxy.address)}
+                    address={network.armProxy.address}
                   />
                 ) : (
                   "n/a"
@@ -221,6 +224,7 @@ function ChainHero({ chains, tokens, network, token, environment, lanes }: Chain
                   <Address
                     endLength={4}
                     contractUrl={getExplorerAddressUrl(network.explorer)(network.tokenAdminRegistry)}
+                    address={network.tokenAdminRegistry}
                   />
                 ) : (
                   "n/a"
@@ -248,6 +252,7 @@ function ChainHero({ chains, tokens, network, token, environment, lanes }: Chain
                   <Address
                     endLength={4}
                     contractUrl={getExplorerAddressUrl(network.explorer)(network.registryModule)}
+                    address={network.registryModule}
                   />
                 ) : (
                   "n/a"
@@ -261,7 +266,7 @@ function ChainHero({ chains, tokens, network, token, environment, lanes }: Chain
           <div className="ccip-chain-hero__feeTokens">
             <div className="ccip-chain-hero__details__label">Fee tokens</div>
             <div className="ccip-chain-hero__feeTokens__list">
-              {feeTokensWithAddress.map(({ token, address, logo }, index) => {
+              {feeTokensWithAddress.map(({ token, address, logo, contractUrl }, index) => {
                 return (
                   <div key={index} className="ccip-chain-hero__feeTokens__item" data-clipboard-type="fee-token">
                     <object
@@ -274,7 +279,7 @@ function ChainHero({ chains, tokens, network, token, environment, lanes }: Chain
                       <img src={fallbackTokenIconUrl} alt={token} width="20px" height="20px" />
                     </object>
                     <div>{token}</div>
-                    <Address endLength={4} contractUrl={address} />
+                    <Address endLength={4} contractUrl={contractUrl} address={address} />
                   </div>
                 )
               })}
diff --git a/src/components/CCIP/ChainHero/TokenDetailsHero.tsx b/src/components/CCIP/ChainHero/TokenDetailsHero.tsx
index 0ef6af7d0d4..b1dd5e503f3 100644
--- a/src/components/CCIP/ChainHero/TokenDetailsHero.tsx
+++ b/src/components/CCIP/ChainHero/TokenDetailsHero.tsx
@@ -56,7 +56,11 @@ function TokenDetailsHero({ network, token }: TokenDetailsHeroProps) {
           <div className="ccip-chain-hero__details__item">
             <div className="ccip-chain-hero__details__label">Token address</div>
             <div className="ccip-chain-hero__details__value" data-clipboard-type="token">
-              <Address endLength={4} contractUrl={getExplorerAddressUrl(network?.explorer)(token.address)} />
+              <Address
+                endLength={4}
+                contractUrl={getExplorerAddressUrl(network?.explorer)(token.address)}
+                address={token.address}
+              />
             </div>
           </div>
           <div className="ccip-chain-hero__details__item">
@@ -66,7 +70,11 @@ function TokenDetailsHero({ network, token }: TokenDetailsHeroProps) {
           <div className="ccip-chain-hero__details__item">
             <div className="ccip-chain-hero__details__label">Token pool address</div>
             <div className="ccip-chain-hero__details__value" data-clipboard-type="token-pool">
-              <Address endLength={4} contractUrl={getExplorerAddressUrl(network?.explorer)(token.poolAddress)} />
+              <Address
+                endLength={4}
+                contractUrl={getExplorerAddressUrl(network?.explorer)(token.poolAddress)}
+                address={token.poolAddress}
+              />
             </div>
           </div>
         </div>