diff --git a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
index 13557e32f..39e935d30 100644
--- a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
+++ b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
@@ -211,7 +211,8 @@ public class FullTextSearchFinder: NSObject {
         var oversizeText: String?
         dbConnection.read({ (transaction) in
             guard let attachment = message.attachment(with: transaction) else {
-                owsFail("Could not load attachment for search indexing.")
+                // This can happen during the initial save of incoming messages.
+                Logger.warn("Could not load attachment for search indexing.")
                 return
             }
             guard let attachmentStream = attachment as? TSAttachmentStream else {