diff --git a/src/wallet/components/WalletDropdownBaseName.tsx b/src/wallet/components/WalletDropdownBaseName.tsx
index 2589aa2191..811a9b4b0b 100644
--- a/src/wallet/components/WalletDropdownBaseName.tsx
+++ b/src/wallet/components/WalletDropdownBaseName.tsx
@@ -9,19 +9,18 @@ import type { WalletDropdownBaseNameReact } from '../types';
 export function WalletDropdownBaseName({
   className,
 }: WalletDropdownBaseNameReact) {
-  const account = useAccount();
+  const { address } = useAccount();
+
+  if (!address) {
+    return null;
+  }
 
   const { data: baseName, isLoading } = useName({
-    address: account.address as `0x${string}`,
+    address,
     chain: base,
   });
 
-  let hasBaseUserName = false;
-
-  if (baseName) {
-    hasBaseUserName = true;
-  }
-
+  const hasBaseUserName = !!baseName;
   const title = hasBaseUserName ? 'Go to profile' : 'Claim a Basename';
   const href = hasBaseUserName
     ? `https://www.base.org/name/${baseName}`
@@ -46,7 +45,11 @@ export function WalletDropdownBaseName({
           <>
             <span className={cn(text.body, 'shrink-0')}>{title}</span>
             {!hasBaseUserName && (
-              <span className="ml-2 rounded-full bg-[#E0E7FF] px-2 text-center font-bold font-inter text-[#4F46E5] text-[0.6875rem] uppercase leading-6">
+              <span
+                className={cn(
+                  'ml-2 rounded-full bg-[#E0E7FF] px-2 text-center font-bold font-inter text-[#4F46E5] text-[0.6875rem] uppercase leading-6',
+                )}
+              >
                 NEW
               </span>
             )}