diff --git a/app/soapbox/components/display_name.js b/app/soapbox/components/display_name.js
index a376dc761..1016c9f5a 100644
--- a/app/soapbox/components/display_name.js
+++ b/app/soapbox/components/display_name.js
@@ -11,9 +11,9 @@ export default class DisplayName extends React.PureComponent {
   };
 
   render() {
-    const { others } = this.props;
+    const { account, others } = this.props;
 
-    let displayName, suffix, account;
+    let displayName, suffix;
 
     if (others && others.size > 1) {
       displayName = others.take(2).map(a => [
@@ -27,12 +27,6 @@ export default class DisplayName extends React.PureComponent {
         suffix = `+${others.size - 2}`;
       }
     } else {
-      if (others && others.size > 0) {
-        account = others.first();
-      } else {
-        account = this.props.account;
-      }
-
       displayName = (
         <>
           <bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi>
diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 848082da6..bc0dc1cbc 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -386,7 +386,7 @@ class Status extends ImmutablePureComponent {
       );
     }
 
-    if (otherAccounts && otherAccounts.size > 0) {
+    if (otherAccounts && otherAccounts.size > 1) {
       statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} />;
     } else if (account === undefined || account === null) {
       statusAvatar = <Avatar account={status.get('account')} size={48} />;