diff --git a/src/components/post-desktop/post-desktop.tsx b/src/components/post-desktop/post-desktop.tsx
index e10edede..11016b5d 100644
--- a/src/components/post-desktop/post-desktop.tsx
+++ b/src/components/post-desktop/post-desktop.tsx
@@ -417,7 +417,7 @@ const PostDesktop = ({ openReplyModal, post, roles, showAllReplies, showReplies
             )}
           </span>
         )}
-        {replyCount === undefined && (
+        {post?.replyCount === undefined && (
           <span className={styles.loadingString}>
             <LoadingEllipsis string={t('loading_comments')} />
           </span>
diff --git a/src/components/post-mobile/post-mobile.tsx b/src/components/post-mobile/post-mobile.tsx
index 3bc81123..910b2ada 100644
--- a/src/components/post-mobile/post-mobile.tsx
+++ b/src/components/post-mobile/post-mobile.tsx
@@ -342,7 +342,7 @@ const PostMobile = ({ openReplyModal, post, roles, showAllReplies, showReplies =
                 </div>
               )}
             </div>
-            {replyCount === undefined && (
+            {post?.replyCount === undefined && (
               <span className={styles.loadingString}>
                 <LoadingEllipsis string={t('loading_comments')} />
               </span>
diff --git a/src/components/settings-modal/avatar-settings/avatar-settings.tsx b/src/components/settings-modal/avatar-settings/avatar-settings.tsx
index c5d91c34..c35ea756 100644
--- a/src/components/settings-modal/avatar-settings/avatar-settings.tsx
+++ b/src/components/settings-modal/avatar-settings/avatar-settings.tsx
@@ -31,7 +31,7 @@ const AvatarPreview = ({ avatar }: any) => {
       </div>
       {state !== 'succeeded' && account?.author?.avatar && (
         <div className={styles.state}>
-          {stateText} {error?.message}
+          {!error && stateText} {error && error?.message}
         </div>
       )}
     </>