diff --git a/lib/models/user.js b/lib/models/user.js
index 11ac274f6..ce427929f 100644
--- a/lib/models/user.js
+++ b/lib/models/user.js
@@ -85,8 +85,12 @@ User.prototype.setPresenceEvent = function(event) {
     }
 
     this.presence = event.getContent().presence;
-    this.displayName = event.getContent().displayname;
-    this.avatarUrl = event.getContent().avatar_url;
+    if (event.getContent().displayname) {
+        this.displayName = event.getContent().displayname;
+    }
+    if (event.getContent().avatarUrl) {
+        this.avatarUrl = event.getContent().avatar_url;
+    }
     this.lastActiveAgo = event.getContent().last_active_ago;
     this.lastPresenceTs = Date.now();
     this.currentlyActive = event.getContent().currently_active;