diff --git a/lib/model/emoji.dart b/lib/model/emoji.dart
index 14c32738e6..b023a5294e 100644
--- a/lib/model/emoji.dart
+++ b/lib/model/emoji.dart
@@ -271,12 +271,18 @@ class EmojiStoreImpl with EmojiStore {
   List<EmojiCandidate> _generateAllCandidates() {
     final results = <EmojiCandidate>[];
 
+    // Include the "popular" emoji in their canonical order
+    // relative to each other.
+    results.addAll(zulipPopularEmojis);
+
     final namesOverridden = {
       for (final emoji in realmEmoji.values) emoji.name,
       'zulip',
     };
     // TODO(log) if _serverEmojiData missing
     for (final entry in (_serverEmojiData ?? {}).entries) {
+      if (_popularEmojiCodes.contains(entry.key)) continue;
+
       final allNames = entry.value;
       final String emojiName;
       final List<String>? aliases;