diff --git a/lib/shared/avatar-utils.js b/lib/shared/avatar-utils.js
--- a/lib/shared/avatar-utils.js
+++ b/lib/shared/avatar-utils.js
@@ -128,7 +128,7 @@
   { color: selectedThreadColors[0], emoji: '🌹', type: 'emoji' },
   { color: selectedThreadColors[1], emoji: '🌸', type: 'emoji' },
   { color: selectedThreadColors[7], emoji: '🌻', type: 'emoji' },
-  { color: selectedThreadColors[3], emoji: '⭐️', type: 'emoji' },
+  { color: selectedThreadColors[3], emoji: '⭐', type: 'emoji' },
   { color: selectedThreadColors[4], emoji: '🌟', type: 'emoji' },
   { color: selectedThreadColors[5], emoji: '🍏', type: 'emoji' },
   { color: selectedThreadColors[6], emoji: '🍎', type: 'emoji' },
@@ -213,7 +213,7 @@
   { color: selectedThreadColors[5], emoji: '🛶', type: 'emoji' },
   { color: selectedThreadColors[6], emoji: '⛵️', type: 'emoji' },
   { color: selectedThreadColors[7], emoji: '🚤', type: 'emoji' },
-  { color: selectedThreadColors[8], emoji: '⚓️', type: 'emoji' },
+  { color: selectedThreadColors[8], emoji: '⚓', type: 'emoji' },
   { color: selectedThreadColors[6], emoji: '🏰', type: 'emoji' },
   { color: selectedThreadColors[0], emoji: '🎡', type: 'emoji' },
   { color: selectedThreadColors[1], emoji: '💎', type: 'emoji' },
@@ -345,6 +345,7 @@
 }
 
 export {
+  defaultEmojiAvatars,
   getRandomDefaultEmojiAvatar,
   getDefaultAvatar,
   getAvatarForUser,
diff --git a/lib/shared/emojis.test.js b/lib/shared/emojis.test.js
--- a/lib/shared/emojis.test.js
+++ b/lib/shared/emojis.test.js
@@ -1,5 +1,6 @@
 // @flow
 
+import { defaultEmojiAvatars } from './avatar-utils.js';
 import { onlyOneEmojiRegex } from './emojis.js';
 
 describe('onlyOneEmojiRegex', () => {
@@ -22,4 +23,16 @@
   it('should not match for (that is 🔥)', () => {
     expect('that is 🔥').not.toMatch(onlyOneEmojiRegex);
   });
+
+  it('should match all defaultEmojiAvatars', () => {
+    for (const emojiAvatar of defaultEmojiAvatars) {
+      const { emoji } = emojiAvatar;
+      expect(emoji).toMatch(onlyOneEmojiRegex);
+    }
+  });
+
+  it('should not match when U+FE0F suffixed', () => {
+    // See D8145 for more context
+    expect('⚓️').not.toMatch(onlyOneEmojiRegex);
+  });
 });