diff --git a/src/components/Buttons/ButtonLink.tsx b/src/components/Buttons/ButtonLink.tsx
index c4ca2be9dd2..8e81abd2170 100644
--- a/src/components/Buttons/ButtonLink.tsx
+++ b/src/components/Buttons/ButtonLink.tsx
@@ -12,6 +12,7 @@ const ButtonLink = ({ customEventOptions, ...props }: ButtonLinkProps) => {
   const handleClick = () => {
     customEventOptions && trackCustomEvent(customEventOptions)
   }
+
   return (
     <Button as={BaseLink} activeStyle={{}} {...props} onClick={handleClick} />
   )
diff --git a/src/components/FindWallet/WalletTable/index.tsx b/src/components/FindWallet/WalletTable/index.tsx
index 06afe9d3015..594bbd3e8e7 100644
--- a/src/components/FindWallet/WalletTable/index.tsx
+++ b/src/components/FindWallet/WalletTable/index.tsx
@@ -330,14 +330,6 @@ const WalletTable = ({
               })
           }
 
-          const handleWalletWebsiteClick = (walletName: string) => {
-            trackCustomEvent({
-              eventCategory: "WalletExternalLinkList",
-              eventAction: "Tap main button",
-              eventName: `${walletName}`,
-            })
-          }
-
           return (
             <WalletContainer
               key={wallet.key}
@@ -350,10 +342,7 @@ const WalletTable = ({
                 }}
                 onClick={(e) => {
                   // Prevent expanding the wallet more info section when clicking on the "Visit website" button
-                  if (
-                    (e.target as HTMLElement).matches("a, a svg")
-                  )
-                    return
+                  if ((e.target as HTMLElement).matches("a, a svg")) return
                   showMoreInfo(wallet)
                 }}
               >
@@ -393,7 +382,11 @@ const WalletTable = ({
                           {hasPersonasLabels && (
                             <Flex gap={1.5} wrap="wrap">
                               {walletPersonas.map((persona) => (
-                                <Tag key={persona} label={t(persona)} variant="highContrast" />
+                                <Tag
+                                  key={persona}
+                                  label={t(persona)}
+                                  variant="highContrast"
+                                />
                               ))}
                             </Flex>
                           )}
@@ -445,9 +438,11 @@ const WalletTable = ({
                               w="auto"
                               isExternal
                               size="sm"
-                              onClick={() =>
-                                handleWalletWebsiteClick(wallet.name)
-                              }
+                              customEventOptions={{
+                                eventCategory: "WalletExternalLinkList",
+                                eventAction: "Tap main button",
+                                eventName: `${wallet.name}`,
+                              }}
                             >
                               {t("page-find-wallet-visit-website")}
                             </ButtonLink>
@@ -474,7 +469,11 @@ const WalletTable = ({
                       w="100%"
                       isExternal
                       size="sm"
-                      onClick={() => handleWalletWebsiteClick(wallet.name)}
+                      customEventOptions={{
+                        eventCategory: "WalletExternalLinkList",
+                        eventAction: "Tap main button",
+                        eventName: `${wallet.name}`,
+                      }}
                     >
                       {t("page-find-wallet-visit-website")}
                     </ButtonLink>