diff --git a/apps/web/src/components/Handle/Handle.tsx b/apps/web/src/components/Handle/Handle.tsx
index 9b345817..6838050f 100644
--- a/apps/web/src/components/Handle/Handle.tsx
+++ b/apps/web/src/components/Handle/Handle.tsx
@@ -176,14 +176,14 @@ function Handle(props: HandleProps) {
             <div className="flex flex-row items-start justify-between">
               <div className="flex flex-row items-center">
                 <Link to={link} className="no-underline">
-                  {!profiles[did]?.avatar.endsWith("/@jpeg") && (
+                  {!profiles[did]?.avatar?.endsWith("/@jpeg") && (
                     <Avatar
                       src={profiles[did]?.avatar}
                       name={profiles[did]?.displayName}
                       size={"60px"}
                     />
                   )}
-                  {profiles[did]?.avatar.endsWith("/@jpeg") && (
+                  {profiles[did]?.avatar?.endsWith("/@jpeg") && (
                     <div className="w-[60px] h-[60px] rounded-full bg-[var(--color-avatar-background)] flex items-center justify-center">
                       <IconUser size={30} color="#fff" />
                     </div>
diff --git a/apps/web/src/pages/home/feed/Feed.tsx b/apps/web/src/pages/home/feed/Feed.tsx
index 1ff01c6a..8f9b05ec 100644
--- a/apps/web/src/pages/home/feed/Feed.tsx
+++ b/apps/web/src/pages/home/feed/Feed.tsx
@@ -220,14 +220,14 @@ function Feed() {
 
                       <div className="flex">
                         <div className="mr-[8px]">
-                          {!song.userAvatar.endsWith("/@jpeg") && (
+                          {!song.userAvatar?.endsWith("/@jpeg") && (
                             <Avatar
                               src={song.userAvatar}
                               name={song.userDisplayName}
                               size={"20px"}
                             />
                           )}
-                          {song.userAvatar.endsWith("/@jpeg") && (
+                          {song.userAvatar?.endsWith("/@jpeg") && (
                             <div className="w-[20px] h-[20px] rounded-full bg-[var(--color-avatar-background)] flex items-center justify-center">
                               <IconUser size={10} color="#fff" />
                             </div>