diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 8e409185..99099e92 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -2365,8 +2365,7 @@ public class Manager implements Closeable {
 
         final var profileEntry = account.getProfileStore().getProfileEntry(address);
         if (profileEntry != null && profileEntry.getProfile() != null) {
-            String name = profileEntry.getProfile().getDisplayName();
-            return name==null?"":name;
+            return profileEntry.getProfile().getDisplayName();
         }
         return null;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
index d55e7e6c..45201e18 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
@@ -77,7 +77,7 @@ public class SignalProfile {
 
     public String getDisplayName() {
         // First name and last name (if set) are separated by a NULL char + trim space in case only one is filled
-        return name == null ? null : name.replace("\0", " ").trim();
+        return name == null ? "" : name.replace("\0", " ").trim();
     }
 
     public String getAbout() {