diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
index 348cf502449..4a1b6388816 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
@@ -66,9 +66,10 @@ class EmojiSource(
 
         var overallIndex = 0
         page.displayEmoji.forEach { emoji: Emoji ->
+          val emojiIndex = overallIndex++
           emoji.variations.forEachIndexed { variationIndex, variation ->
             val raw = emoji.getRawVariation(variationIndex)
-            tree.add(variation, EmojiDrawInfo(emojiPage, overallIndex++, variation, raw, jumboPages[raw]))
+            tree.add(variation, EmojiDrawInfo(emojiPage, emojiIndex, variation, raw, jumboPages[raw]))
           }
         }
       }