diff --git a/SignalServiceKit/Spam/SpamReportingTokenRecord.swift b/SignalServiceKit/Spam/SpamReportingTokenRecord.swift
index d0120ff0d3..b8de815ec5 100644
--- a/SignalServiceKit/Spam/SpamReportingTokenRecord.swift
+++ b/SignalServiceKit/Spam/SpamReportingTokenRecord.swift
@@ -38,8 +38,10 @@ public struct SpamReportingTokenRecord: Codable, FetchableRecord, PersistableRec
     public static func reportingToken(
         for sourceAci: Aci,
         database: Database,
-    ) throws -> SpamReportingToken? {
-        try Self.fetchOne(database, key: sourceAci.rawUUID)?.spamReportingToken
+    ) -> SpamReportingToken? {
+        return failIfThrows {
+            return try Self.fetchOne(database, key: sourceAci.rawUUID)
+        }?.spamReportingToken
     }
 }
 
diff --git a/SignalUI/Utils/SpamReportingUIUtils.swift b/SignalUI/Utils/SpamReportingUIUtils.swift
index 41ce3dd80f..873481bf5e 100644
--- a/SignalUI/Utils/SpamReportingUIUtils.swift
+++ b/SignalUI/Utils/SpamReportingUIUtils.swift
@@ -189,15 +189,7 @@ public enum ReportSpamUIUtils {
             owsFailDebug("Failed to lookup guids to report \(error)")
         }
 
-        var reportingToken: SpamReportingToken?
-        do {
-            reportingToken = try SpamReportingTokenRecord.reportingToken(
-                for: aci,
-                database: tx.database,
-            )
-        } catch {
-            owsFailBeta("Failed to look up spam reporting token. Continuing on, as the parameter is optional. Error: \(error)")
-        }
+        let reportingToken = SpamReportingTokenRecord.reportingToken(for: aci, database: tx.database)
 
         guard !guidsToReport.isEmpty else {
             Logger.warn("No messages with serverGuids to report.")