diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Account.java b/app/src/main/java/app/fedilab/android/client/Entities/Account.java
index 947bcb492..537e81476 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Account.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Account.java
@@ -200,7 +200,7 @@ public class Account implements Parcelable {
     }
 
     public static void makeAccountNameEmoji(final Context context, Account account) {
-        if (((Activity) context).isFinishing())
+        if (((Activity) context).isFinishing() || account.getDisplay_name() == null)
             return;
 
         account.setDisplayNameSpan(new SpannableString(account.getDisplay_name()));