diff --git a/client/src/components/Endpoints/Icon.tsx b/client/src/components/Endpoints/Icon.tsx
index 4ae8db12b8..9b9d56101a 100644
--- a/client/src/components/Endpoints/Icon.tsx
+++ b/client/src/components/Endpoints/Icon.tsx
@@ -38,7 +38,7 @@ const UserAvatar = memo(({ size, user, avatarSrc, username, className }: UserAva
         <UserIcon />
       </div>
     ) : (
-      <img className="rounded-full" src={user?.avatar ?? avatarSrc} alt="avatar" />
+      <img className="rounded-full" src={(user?.avatar ?? '') || avatarSrc} alt="avatar" />
     )}
   </div>
 ));
diff --git a/client/src/components/Nav/AccountSettings.tsx b/client/src/components/Nav/AccountSettings.tsx
index 1b227d3663..b6f09f65fd 100644
--- a/client/src/components/Nav/AccountSettings.tsx
+++ b/client/src/components/Nav/AccountSettings.tsx
@@ -50,7 +50,7 @@ function AccountSettings() {
             ) : (
               <img
                 className="rounded-full"
-                src={user?.avatar ?? avatarSrc}
+                src={(user?.avatar ?? '') || avatarSrc}
                 alt={`${name}'s avatar`}
               />
             )}