diff --git a/src/editor/parts.js b/src/editor/parts.js
index bc420ecde1..8d0fe36c28 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -284,6 +284,9 @@ class UserPillPart extends PillPart {
     }
 
     setAvatar(node) {
+        if (!this._member) {
+            return;
+        }
         const name = this._member.name || this._member.userId;
         const defaultAvatarUrl = Avatar.defaultAvatarUrlForString(this._member.userId);
         let avatarUrl = Avatar.avatarUrlForMember(