diff --git a/packages/stream_chat/lib/src/api/channel.dart b/packages/stream_chat/lib/src/api/channel.dart
index 1e7f824e..aeda98e7 100644
--- a/packages/stream_chat/lib/src/api/channel.dart
+++ b/packages/stream_chat/lib/src/api/channel.dart
@@ -256,7 +256,10 @@ class Channel {
     String messageId,
     Iterable<String> attachmentIds,
   ) {
-    final message = state!.messages.firstWhereOrNull(
+    final message = [
+      ...state!.messages,
+      ...state!.threads.values.expand((messages) => messages),
+    ].firstWhereOrNull(
       (it) => it.id == messageId,
     );