diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index daf166796..e651de6f0 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -1061,8 +1061,9 @@ MessageReceiver.prototype.extend({
           const primaryConversation = ConversationController.get(
             primaryDevicePubKey
           );
-          //
-          this.updateProfile(primaryConversation, profile, profileKey);
+          if (profile) {
+            this.updateProfile(primaryConversation, profile, profileKey);
+          }
         }
 
         const ev = new Event('sent');
diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
index 0a71ec302..add9170b2 100644
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@@ -145,17 +145,17 @@ Message.prototype = {
       proto.profileKey = this.profileKey;
     }
 
-    // Only send the display name for now.
-    // In the future we might want to extend this to send other things.
-    if (this.profile && this.profile.displayName) {
+    // Set the loki profile
+    if (this.profile) {
       const profile = new textsecure.protobuf.DataMessage.LokiProfile();
-      profile.displayName = this.profile.displayName;
+      if (this.profile.displayName) {
+        profile.displayName = this.profile.displayName;
+      }
 
       const conversation = window.ConversationController.get(
         textsecure.storage.user.getNumber()
       );
       const avatarPointer = conversation.get('avatarPointer');
-
       if (avatarPointer) {
         profile.avatar = avatarPointer;
       }