diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiPageCache.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiPageCache.kt
index b29d19d919..cba8b14b8d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiPageCache.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiPageCache.kt
@@ -61,6 +61,10 @@ object EmojiPageCache {
     }
   }
 
+  fun clear() {
+    cache.clear()
+  }
+
   @WorkerThread
   private fun loadInternal(context: Context, emojiPageRequest: EmojiPageRequest): Bitmap? {
     val inputStream: InputStream = when (emojiPageRequest.emojiPage) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob.java
index cba3a8dae3..0df840b49f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob.java
@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.emoji.EmojiData;
 import org.thoughtcrime.securesms.emoji.EmojiFiles;
 import org.thoughtcrime.securesms.emoji.EmojiImageRequest;
 import org.thoughtcrime.securesms.emoji.EmojiJsonRequest;
+import org.thoughtcrime.securesms.emoji.EmojiPageCache;
 import org.thoughtcrime.securesms.emoji.EmojiRemote;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.jobmanager.Data;
@@ -432,6 +433,8 @@ public class DownloadLatestEmojiDataJob extends BaseJob {
           .filterNot(file -> file.getName().equals(currentDirectoryName))
           .filterNot(file -> file.getName().equals(newVersionDirectoryName))
           .forEach(FileUtils::deleteDirectory);
+
+    EmojiPageCache.INSTANCE.clear();
   }
 
   public static final class Factory implements Job.Factory<DownloadLatestEmojiDataJob> {