1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index beddb195d..a380a3368 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -624,7 +624,11 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
     }
 
     private void onEditYourNameClicked(View view) {
-        quickEdit(mAccount.getDisplayName(), R.string.your_name, value -> {
+        String nick = "";
+        if (mAccount.getDisplayName() != null) {
+            nick = mAccount.getDisplayName();
+        }
+        quickEdit(nick, R.string.your_name, value -> {
             final String displayName = value.trim();
             updateDisplayName(displayName);
             mAccount.setDisplayName(displayName);