diff --git a/src/components/name-text.jsx b/src/components/name-text.jsx
index 0137f500..36e8c198 100644
--- a/src/components/name-text.jsx
+++ b/src/components/name-text.jsx
@@ -52,7 +52,7 @@ function NameText({
     >
       {showAvatar && (
         <>
-          <Avatar url={avatar} />{' '}
+          <Avatar url={avatarStatic || avatar} />{' '}
         </>
       )}
       {displayName && !short ? (
diff --git a/src/components/status.jsx b/src/components/status.jsx
index a2f78172..8494538b 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -639,7 +639,7 @@ function Status({
             };
           }}
         >
-          <Avatar url={avatarStatic} size="xxl" />
+          <Avatar url={avatarStatic || avatar} size="xxl" />
         </a>
       )}
       <div class="container">