diff --git a/src/components/account-block.jsx b/src/components/account-block.jsx
index 13c680be..08bbe4fb 100644
--- a/src/components/account-block.jsx
+++ b/src/components/account-block.jsx
@@ -13,6 +13,7 @@ function AccountBlock({
   skeleton,
   account,
   avatarSize = 'xl',
+  useAvatarStatic = false,
   instance,
   external,
   internal,
@@ -81,7 +82,11 @@ function AccountBlock({
         }
       }}
     >
-      <Avatar url={avatar} size={avatarSize} squircle={bot} />
+      <Avatar
+        url={useAvatarStatic ? avatarStatic : avatar || avatarStatic}
+        size={avatarSize}
+        squircle={bot}
+      />
       <span class="account-block-content">
         {!hideDisplayName && (
           <>
diff --git a/src/components/compose.jsx b/src/components/compose.jsx
index 3188aed5..ed06d3e2 100644
--- a/src/components/compose.jsx
+++ b/src/components/compose.jsx
@@ -613,6 +613,7 @@ function Compose({
               account={currentAccountInfo}
               accountInstance={currentAccount.instanceURL}
               hideDisplayName
+              useAvatarStatic
             />
           )}
           {!standalone ? (