diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
index 8b82dc4fce..7dd603aafd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -648,8 +648,11 @@ public class Recipient {
   public @NonNull String getShortDisplayName(@NonNull Context context) {
     String name = Util.getFirstNonEmpty(getGroupName(context),
                                         getNickname().getGivenName(),
+                                        getNickname().toString(),
                                         getSystemProfileName().getGivenName(),
+                                        getSystemProfileName().toString(),
                                         getProfileName().getGivenName(),
+                                        getProfileName().toString(),
                                         getUsername().orElse(null),
                                         getDisplayName(context));