diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SearchTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SearchTable.kt
index 6c2db11b19..7a1215544c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SearchTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SearchTable.kt
@@ -146,6 +146,12 @@ class SearchTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
   fun rebuildIndex(batchSize: Long = 10_000L) {
     val maxId: Long = SignalDatabase.messages.getNextId()
 
+    if (!SqlUtil.tableExists(readableDatabase, FTS_TABLE_NAME)) {
+      Log.w(TAG, "FTS table does not exist. Rebuilding.")
+      fullyResetTables()
+      return
+    }
+
     Log.i(TAG, "Re-indexing. Operating on ID's 1-$maxId in steps of $batchSize.")
 
     for (i in 1..maxId step batchSize) {