diff --git a/Sources/Integration/Session/Session.swift b/Sources/Integration/Session/Session.swift
index 8a1c20407a7fa24ede9ea75f9468034210dca89f..d2ab638a5a6aefd6e7a69d917e55deaa0cbca53e 100644
--- a/Sources/Integration/Session/Session.swift
+++ b/Sources/Integration/Session/Session.swift
@@ -247,12 +247,12 @@ public final class Session: SessionType {
                     .compactMap(\.fileTransferId))))
         else { return }
 
-        let pairs = unfinishedSendingMessages.map { message -> (Message, FileTransfer) in
-            let transfer = unfinishedSendingTransfers.first { ft in
+        let pairs = unfinishedSendingMessages.compactMap { message -> (Message, FileTransfer)? in
+            guard let transfer = unfinishedSendingTransfers.first(where: { ft in
                 ft.id == message.fileTransferId
-            }
+            }) else { return nil }
 
-            return (message, transfer!)
+            return (message, transfer)
         }
 
         pairs.forEach { message, transfer in