diff --git a/package.json b/package.json
index a2fd54117a..ba5ef31c93 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "react-dom": "^19.0.0",
     "elliptic": "6.6.1"
   },
-  "packageManager": "pnpm@10.4.1",
+  "packageManager": "pnpm@10.10.0",
   "pnpm": {
     "ignoredBuiltDependencies": [
       "@biomejs/biome",
diff --git a/packages/rainbowkit/package.json b/packages/rainbowkit/package.json
index 618072687e..12da39348a 100644
--- a/packages/rainbowkit/package.json
+++ b/packages/rainbowkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@stakekit/rainbowkit",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "The best way to connect a wallet",
   "files": ["dist", "styles.css", "wallets"],
   "type": "module",
diff --git a/packages/rainbowkit/src/components/Avatar/Avatar.tsx b/packages/rainbowkit/src/components/Avatar/Avatar.tsx
index c9d82f1aed..726d98ad4d 100644
--- a/packages/rainbowkit/src/components/Avatar/Avatar.tsx
+++ b/packages/rainbowkit/src/components/Avatar/Avatar.tsx
@@ -13,6 +13,10 @@ interface AvatarProps {
 export function Avatar({ address, imageUrl, loading, size }: AvatarProps) {
   const AvatarComponent = useContext(AvatarContext);
 
+  if (!AvatarComponent) {
+    return null;
+  }
+
   return (
     <Box
       aria-hidden
diff --git a/packages/rainbowkit/src/components/RainbowKitProvider/AvatarContext.ts b/packages/rainbowkit/src/components/RainbowKitProvider/AvatarContext.ts
index 16485eff95..07ddf14561 100644
--- a/packages/rainbowkit/src/components/RainbowKitProvider/AvatarContext.ts
+++ b/packages/rainbowkit/src/components/RainbowKitProvider/AvatarContext.ts
@@ -11,4 +11,6 @@ export type AvatarComponent = React.FunctionComponent<AvatarComponentProps>;
 
 export const defaultAvatar = EmojiAvatar;
 
-export const AvatarContext = createContext<AvatarComponent>(defaultAvatar);
+export const AvatarContext = createContext<AvatarComponent | null>(
+  defaultAvatar,
+);
diff --git a/packages/rainbowkit/src/components/RainbowKitProvider/RainbowKitProvider.tsx b/packages/rainbowkit/src/components/RainbowKitProvider/RainbowKitProvider.tsx
index 8df915ad9a..25d24c0983 100644
--- a/packages/rainbowkit/src/components/RainbowKitProvider/RainbowKitProvider.tsx
+++ b/packages/rainbowkit/src/components/RainbowKitProvider/RainbowKitProvider.tsx
@@ -76,7 +76,7 @@ export interface RainbowKitProviderProps {
     disclaimer?: DisclaimerComponent;
   };
   coolMode?: boolean;
-  avatar?: AvatarComponent;
+  avatar?: AvatarComponent | null;
   modalSize?: ModalSizes;
   locale?: Locale;
   dialogRoot?: Element;
@@ -120,7 +120,7 @@ export function RainbowKitProvider({
     ...appInfo,
   };
 
-  const avatarContext = avatar ?? defaultAvatar;
+  const avatarContext = typeof avatar === 'undefined' ? defaultAvatar : avatar;
 
   return (
     <RainbowKitChainProvider