diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift
index 7d03bfb44..7b740f5fc 100644
--- a/Signal/src/ViewControllers/MessageDetailViewController.swift
+++ b/Signal/src/ViewControllers/MessageDetailViewController.swift
@@ -400,8 +400,7 @@ class MessageDetailViewController: OWSViewController, UIScrollViewDelegate {
     }
 
     private func fetchAttachment(transaction: YapDatabaseReadTransaction) -> TSAttachment? {
-        guard let attachmentId = message.attachmentIds[0] as? String else {
-            owsFail("Invalid attachment")
+        guard let attachmentId = message.attachmentIds.firstObject as? String else {
             return nil
         }