diff --git a/src/components/layout/header/AccountDropdown.tsx b/src/components/layout/header/AccountDropdown.tsx
index 14a1e73e..4decda63 100644
--- a/src/components/layout/header/AccountDropdown.tsx
+++ b/src/components/layout/header/AccountDropdown.tsx
@@ -11,6 +11,7 @@ import { AccountIdentity } from '@/components/shared/account-identity';
 import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem } from '@/components/ui/dropdown-menu';
 import { useStyledToast } from '@/hooks/useStyledToast';
 import { getExplorerURL } from '@/utils/external';
+import { SupportedNetworks } from '@/utils/networks';
 
 export function AccountDropdown() {
   const { address, chainId } = useConnection();
@@ -61,6 +62,7 @@ export function AccountDropdown() {
             />
             <AccountIdentity
               address={address}
+              chainId={chainId ?? SupportedNetworks.Mainnet}
               variant="badge"
               showActions={false}
             />
diff --git a/src/components/shared/account-actions-popover.tsx b/src/components/shared/account-actions-popover.tsx
index 3e7fe38c..2f24fb41 100644
--- a/src/components/shared/account-actions-popover.tsx
+++ b/src/components/shared/account-actions-popover.tsx
@@ -11,7 +11,8 @@ import type { Address } from 'viem';
 
 type AccountActionsPopoverProps = {
   address: Address;
-  children: ReactNode;
+  children?: ReactNode;
+  chainId?: number;
 };
 
 /**
@@ -20,7 +21,7 @@ type AccountActionsPopoverProps = {
  * - View account (positions page)
  * - View on Etherscan
  */
-export function AccountActionsPopover({ address, children }: AccountActionsPopoverProps) {
+export function AccountActionsPopover({ address, chainId, children }: AccountActionsPopoverProps) {
   const toast = useStyledToast();
 
   const handleCopy = useCallback(async () => {
@@ -37,9 +38,9 @@ export function AccountActionsPopover({ address, children }: AccountActionsPopov
   }, [address]);
 
   const handleViewExplorer = useCallback(() => {
-    const explorerUrl = getExplorerURL(address, SupportedNetworks.Mainnet);
+    const explorerUrl = getExplorerURL(address, (chainId ?? SupportedNetworks.Mainnet) as SupportedNetworks);
     window.open(explorerUrl, '_blank', 'noopener,noreferrer');
-  }, [address]);
+  }, [address, chainId]);
 
   return (
     <DropdownMenu>
diff --git a/src/components/shared/account-identity.tsx b/src/components/shared/account-identity.tsx
index 24085549..603763ef 100644
--- a/src/components/shared/account-identity.tsx
+++ b/src/components/shared/account-identity.tsx
@@ -19,6 +19,7 @@ import type { Address } from 'viem';
 
 type AccountIdentityProps = {
   address: Address;
+  chainId: number;
   variant?: 'badge' | 'compact' | 'full';
   linkTo?: 'explorer' | 'profile' | 'none';
   copyable?: boolean;
@@ -41,6 +42,7 @@ type AccountIdentityProps = {
  */
 export function AccountIdentity({
   address,
+  chainId,
   variant = 'badge',
   linkTo = 'none',
   copyable = false,
@@ -72,7 +74,7 @@ export function AccountIdentity({
 
     if (linkTo === 'none') return null;
     if (linkTo === 'explorer') {
-      return getExplorerURL(address as `0x${string}`, SupportedNetworks.Mainnet);
+      return getExplorerURL(address as `0x${string}`, chainId ?? SupportedNetworks.Mainnet);
     }
     if (linkTo === 'profile') {
       return `/positions/${address}`;
@@ -152,7 +154,14 @@ export function AccountIdentity({
     );
 
     if (showActions) {
-      return <AccountActionsPopover address={address}>{badgeElement}</AccountActionsPopover>;
+      return (
+        <AccountActionsPopover
+          address={address}
+          chainId={chainId}
+        >
+          {badgeElement}
+        </AccountActionsPopover>
+      );
     }
 
     return badgeElement;
@@ -228,7 +237,14 @@ export function AccountIdentity({
     );
 
     if (showActions) {
-      return <AccountActionsPopover address={address}>{compactElement}</AccountActionsPopover>;
+      return (
+        <AccountActionsPopover
+          address={address}
+          chainId={chainId}
+        >
+          {compactElement}
+        </AccountActionsPopover>
+      );
     }
 
     return compactElement;
@@ -327,7 +343,14 @@ export function AccountIdentity({
     );
 
   if (showActions) {
-    return <AccountActionsPopover address={address}>{fullElement}</AccountActionsPopover>;
+    return (
+      <AccountActionsPopover
+        address={address}
+        chainId={chainId}
+      >
+        {fullElement}
+      </AccountActionsPopover>
+    );
   }
 
   return fullElement;
diff --git a/src/components/shared/allocator-card.tsx b/src/components/shared/allocator-card.tsx
index e41add68..8cbc91f2 100644
--- a/src/components/shared/allocator-card.tsx
+++ b/src/components/shared/allocator-card.tsx
@@ -1,5 +1,7 @@
 import type { Address } from 'viem';
 import { AccountIdentity } from './account-identity';
+import { useConnection } from 'wagmi';
+import { SupportedNetworks } from '@/utils/networks';
 
 type AllocatorCardProps = {
   name: string;
@@ -18,6 +20,7 @@ export function AllocatorCard({
   onSelect,
   disabled = false,
 }: AllocatorCardProps): JSX.Element {
+  const { chainId } = useConnection();
   return (
     <button
       type="button"
@@ -51,6 +54,7 @@ export function AllocatorCard({
         <div className="text-xs text-secondary">
           <AccountIdentity
             address={address}
+            chainId={chainId ?? SupportedNetworks.Mainnet}
             variant="full"
           />
         </div>
diff --git a/src/components/ui/badge.tsx b/src/components/ui/badge.tsx
index cf54cc49..df9b0275 100644
--- a/src/components/ui/badge.tsx
+++ b/src/components/ui/badge.tsx
@@ -25,7 +25,7 @@ const badge = tv({
 });
 
 export type BadgeProps = {
-  children: ReactNode;
+  children?: ReactNode;
   className?: string;
 } & VariantProps<typeof badge>;
 
diff --git a/src/components/ui/tooltip.tsx b/src/components/ui/tooltip.tsx
index 351c0490..e01a5863 100644
--- a/src/components/ui/tooltip.tsx
+++ b/src/components/ui/tooltip.tsx
@@ -31,7 +31,7 @@ TooltipContent.displayName = TooltipPrimitive.Content.displayName;
 
 // Main Tooltip component that matches HeroUI API
 type TooltipProps = {
-  children: React.ReactNode;
+  children?: React.ReactNode;
   content: React.ReactNode;
   placement?: 'top' | 'bottom' | 'left' | 'right';
   delay?: number;
diff --git a/src/features/admin/components/transaction-table-body.tsx b/src/features/admin/components/transaction-table-body.tsx
index 10213407..9cf9c717 100644
--- a/src/features/admin/components/transaction-table-body.tsx
+++ b/src/features/admin/components/transaction-table-body.tsx
@@ -62,6 +62,7 @@ export function TransactionTableBody({ operations, selectedNetwork }: Transactio
             >
               <AccountIdentity
                 address={op.user as `0x${string}`}
+                chainId={selectedNetwork}
                 variant="badge"
                 linkTo="profile"
               />
diff --git a/src/features/autovault/components/vault-detail/settings/AgentListItem.tsx b/src/features/autovault/components/vault-detail/settings/AgentListItem.tsx
index 487abcaf..398c37be 100644
--- a/src/features/autovault/components/vault-detail/settings/AgentListItem.tsx
+++ b/src/features/autovault/components/vault-detail/settings/AgentListItem.tsx
@@ -3,13 +3,15 @@ import { Avatar } from '@/components/Avatar/Avatar';
 import { AgentIcon } from '@/components/shared/agent-icon';
 import { AccountIdentity } from '@/components/shared/account-identity';
 import { findAgent } from '@/utils/monarch-agent';
+import { SupportedNetworks } from '@/utils/networks';
 
 type AgentListItemProps = {
   address: Address;
+  chainId?: number;
   ownerAddress?: Address;
 };
 
-export function AgentListItem({ address, ownerAddress }: AgentListItemProps) {
+export function AgentListItem({ address, chainId, ownerAddress }: AgentListItemProps) {
   const agent = findAgent(address);
   const isOwner = ownerAddress && address.toLowerCase() === ownerAddress.toLowerCase();
 
@@ -31,6 +33,7 @@ export function AgentListItem({ address, ownerAddress }: AgentListItemProps) {
       {agent && !isOwner && <span className="text-sm font-medium">{agent.name}</span>}
       <AccountIdentity
         address={address}
+        chainId={chainId ?? SupportedNetworks.Mainnet}
         variant="badge"
       />
     </div>
diff --git a/src/features/autovault/components/vault-detail/settings/AgentsTab.tsx b/src/features/autovault/components/vault-detail/settings/AgentsTab.tsx
index d480ced1..8ba9bada 100644
--- a/src/features/autovault/components/vault-detail/settings/AgentsTab.tsx
+++ b/src/features/autovault/components/vault-detail/settings/AgentsTab.tsx
@@ -80,6 +80,7 @@ export function AgentsTab({ vaultAddress, chainId }: AgentsTabProps) {
         {normalized ? (
           <AccountIdentity
             address={normalized}
+            chainId={chainId}
             variant="compact"
             linkTo="explorer"
             copyable
@@ -130,6 +131,7 @@ export function AgentsTab({ vaultAddress, chainId }: AgentsTabProps) {
                   >
                     <AgentListItem
                       address={address as Address}
+                      chainId={chainId}
                       ownerAddress={owner as Address}
                     />
                     <Button
@@ -164,6 +166,7 @@ export function AgentsTab({ vaultAddress, chainId }: AgentsTabProps) {
                     <div className="flex flex-col gap-2">
                       <AgentListItem
                         address={agent.address as Address}
+                        chainId={chainId}
                         ownerAddress={owner as Address}
                       />
                       <p className="ml-8 text-xs text-secondary">{agent.strategyDescription}</p>
@@ -211,6 +214,7 @@ export function AgentsTab({ vaultAddress, chainId }: AgentsTabProps) {
               >
                 <AgentListItem
                   address={address as Address}
+                  chainId={chainId}
                   ownerAddress={owner as Address}
                 />
               </div>
@@ -237,6 +241,7 @@ export function AgentsTab({ vaultAddress, chainId }: AgentsTabProps) {
               <AccountIdentity
                 key={address}
                 address={address as Address}
+                chainId={chainId}
                 variant="compact"
                 linkTo="explorer"
                 copyable
diff --git a/src/features/market-detail/components/borrowers-table.tsx b/src/features/market-detail/components/borrowers-table.tsx
index 57cdcb4d..a4d088e1 100644
--- a/src/features/market-detail/components/borrowers-table.tsx
+++ b/src/features/market-detail/components/borrowers-table.tsx
@@ -141,6 +141,7 @@ export function BorrowersTable({ chainId, market, minShares, oraclePrice, onOpen
                       <TableCell>
                         <AccountIdentity
                           address={borrower.userAddress as Address}
+                          chainId={chainId}
                           variant="compact"
                           linkTo="profile"
                         />
diff --git a/src/features/market-detail/components/borrows-table.tsx b/src/features/market-detail/components/borrows-table.tsx
index 8eed79c2..6691bc9d 100644
--- a/src/features/market-detail/components/borrows-table.tsx
+++ b/src/features/market-detail/components/borrows-table.tsx
@@ -119,6 +119,7 @@ export function BorrowsTable({ chainId, market, minAssets, onOpenFiltersModal }:
                     <TableCell>
                       <AccountIdentity
                         address={borrow.userAddress as Address}
+                        chainId={chainId}
                         variant="compact"
                         linkTo="profile"
                       />
diff --git a/src/features/market-detail/components/liquidations-table.tsx b/src/features/market-detail/components/liquidations-table.tsx
index ef676e83..cd2fa4eb 100644
--- a/src/features/market-detail/components/liquidations-table.tsx
+++ b/src/features/market-detail/components/liquidations-table.tsx
@@ -88,6 +88,7 @@ export function LiquidationsTable({ chainId, market }: LiquidationsTableProps) {
                         {isLiquidatorAddress ? (
                           <AccountIdentity
                             address={liquidation.liquidator as Address}
+                            chainId={chainId}
                             variant="compact"
                             linkTo="profile"
                           />
diff --git a/src/features/market-detail/components/suppliers-table.tsx b/src/features/market-detail/components/suppliers-table.tsx
index 7b37527d..fd193765 100644
--- a/src/features/market-detail/components/suppliers-table.tsx
+++ b/src/features/market-detail/components/suppliers-table.tsx
@@ -132,6 +132,7 @@ export function SuppliersTable({ chainId, market, minShares, onOpenFiltersModal
                       <TableCell>
                         <AccountIdentity
                           address={supplier.userAddress as Address}
+                          chainId={chainId}
                           variant="compact"
                           linkTo="profile"
                         />
diff --git a/src/features/market-detail/components/supplies-table.tsx b/src/features/market-detail/components/supplies-table.tsx
index f3802946..02ef5efc 100644
--- a/src/features/market-detail/components/supplies-table.tsx
+++ b/src/features/market-detail/components/supplies-table.tsx
@@ -114,6 +114,7 @@ export function SuppliesTable({ chainId, market, minAssets, onOpenFiltersModal }
                     <TableCell>
                       <AccountIdentity
                         address={supply.userAddress as Address}
+                        chainId={chainId}
                         variant="compact"
                         linkTo="profile"
                       />
diff --git a/src/features/market-detail/market-view.tsx b/src/features/market-detail/market-view.tsx
index 8e6964e1..be868c8d 100644
--- a/src/features/market-detail/market-view.tsx
+++ b/src/features/market-detail/market-view.tsx
@@ -266,8 +266,8 @@ function MarketContent() {
   };
 
   const handleAccrueInterest = async () => {
-    await switchChainAsync({ chainId: market.morphoBlue.chain.id });
     const morphoAddress = market.morphoBlue.address as Address;
+    await switchChainAsync({ chainId: market.morphoBlue.chain.id });
 
     sendTransaction({
       to: morphoAddress,
diff --git a/src/features/positions/positions-view.tsx b/src/features/positions/positions-view.tsx
index 97876edc..a8e5ebd9 100644
--- a/src/features/positions/positions-view.tsx
+++ b/src/features/positions/positions-view.tsx
@@ -18,10 +18,13 @@ import { useModal } from '@/hooks/useModal';
 import { SuppliedMorphoBlueGroupedTable } from './components/supplied-morpho-blue-grouped-table';
 import { PortfolioValueBadge } from './components/portfolio-value-badge';
 import { UserVaultsTable } from './components/user-vaults-table';
+import { useConnection } from 'wagmi';
+import { SupportedNetworks } from '@/utils/networks';
 
 export default function Positions() {
   const { account } = useParams<{ account: string }>();
   const { open } = useModal();
+  const { chainId } = useConnection();
 
   const { loading: isMarketsLoading } = useProcessedMarkets();
 
@@ -83,6 +86,7 @@ export default function Positions() {
         <div className="flex flex-col items-center justify-between gap-4 pb-4 sm:flex-row">
           <AccountIdentity
             address={account as Address}
+            chainId={chainId ?? SupportedNetworks.Mainnet}
             variant="full"
             showAddress
           />
diff --git a/src/features/rewards/rewards-view.tsx b/src/features/rewards/rewards-view.tsx
index 380164dd..4bf6c343 100644
--- a/src/features/rewards/rewards-view.tsx
+++ b/src/features/rewards/rewards-view.tsx
@@ -164,6 +164,7 @@ export default function Rewards() {
         <div className="flex flex-col items-center justify-between pb-8 sm:flex-row">
           <AccountIdentity
             address={account as Address}
+            chainId={SupportedNetworks.Mainnet}
             variant="full"
             showAddress
           />