diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
index 0330176b6..76c38aa03 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
@@ -383,7 +383,7 @@ public class RetrieveProfileJob extends BaseJob {
         Log.i(TAG, "Profile name updated. Writing new value.");
         DatabaseFactory.getRecipientDatabase(context).setProfileName(recipient.getId(), ProfileName.fromSerialized(plaintextProfileName));
 
-        if (!recipient.isGroup() && !recipient.isLocalNumber()) {
+        if (!(recipient.isGroup() || recipient.isLocalNumber() || TextUtils.isEmpty(previousProfileName))) {
           //noinspection ConstantConditions
           DatabaseFactory.getSmsDatabase(context).insertProfileNameChangeMessages(recipient, newProfileName, previousProfileName);
         }
diff --git a/app/src/main/res/layout/conversation_item_update.xml b/app/src/main/res/layout/conversation_item_update.xml
index f70b86a63..c64310db9 100644
--- a/app/src/main/res/layout/conversation_item_update.xml
+++ b/app/src/main/res/layout/conversation_item_update.xml
@@ -47,7 +47,7 @@
         android:gravity="center"
         android:orientation="vertical">
 
-        <TextView
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
             android:id="@+id/conversation_update_body"
             style="@style/Signal.Text.Preview"
             android:layout_width="wrap_content"