diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java
index 6ef575cffb..7f9b9071d1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java
@@ -115,6 +115,7 @@ public final class EmojiSearchIndexDownloadJob extends BaseJob {
 
     DatabaseFactory.getEmojiSearchDatabase(context).setSearchIndex(searchIndex);
     SignalStore.emojiValues().onSearchIndexUpdated(manifest.getVersion(), remoteLanguage);
+    SignalStore.emojiValues().setLastSearchIndexCheck(System.currentTimeMillis());
 
     Log.i(TAG, "Success! Now at version: " + manifest.getVersion() + ", language: " + remoteLanguage);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/EmojiValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/EmojiValues.java
index 6846956d85..57d33b5852 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/EmojiValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/EmojiValues.java
@@ -104,7 +104,7 @@ public class EmojiValues extends SignalStoreValues {
     return getLong(LAST_SEARCH_CHECK, 0);
   }
 
-  public void setLastSearchIndexCheck(int time) {
+  public void setLastSearchIndexCheck(long time) {
     putLong(LAST_SEARCH_CHECK, time);
   }
 }