diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/OptimizeMessageSearchIndexJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/OptimizeMessageSearchIndexJob.kt
index f6a35efa95..b970a9426b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/OptimizeMessageSearchIndexJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/OptimizeMessageSearchIndexJob.kt
@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.jobs
 
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobmanager.Data
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.transport.RetryLaterException
@@ -16,8 +18,7 @@ class OptimizeMessageSearchIndexJob private constructor(parameters: Parameters)
 
     @JvmStatic
     fun enqueue() {
-      // TODO [greyson] Temporarily disabled until we can figure out what to do.
-//      ApplicationDependencies.getJobManager().add(OptimizeMessageSearchIndexJob())
+      ApplicationDependencies.getJobManager().add(OptimizeMessageSearchIndexJob())
     }
   }
 
@@ -36,12 +37,11 @@ class OptimizeMessageSearchIndexJob private constructor(parameters: Parameters)
   override fun getNextRunAttemptBackoff(pastAttemptCount: Int, exception: Exception): Long = 30.seconds.inWholeMilliseconds
 
   override fun onRun() {
-    // TODO [greyson] Temporarily disabled until we can figure out what to do.
-//    val success = SignalDatabase.messageSearch.optimizeIndex(5.seconds.inWholeMilliseconds)
-//
-//    if (!success) {
-//      throw RetryLaterException()
-//    }
+    val success = SignalDatabase.messageSearch.optimizeIndex(5.seconds.inWholeMilliseconds)
+
+    if (!success) {
+      throw RetryLaterException()
+    }
   }
 
   class Factory : Job.Factory<OptimizeMessageSearchIndexJob> {