diff --git a/packages/stream_chat/lib/src/api/channel.dart b/packages/stream_chat/lib/src/api/channel.dart
index 8a099aff..aeda98e7 100644
--- a/packages/stream_chat/lib/src/api/channel.dart
+++ b/packages/stream_chat/lib/src/api/channel.dart
@@ -258,7 +258,7 @@ class Channel {
   ) {
     final message = [
       ...state!.messages,
-      ...state!.threads.values.expand((element) => element),
+      ...state!.threads.values.expand((messages) => messages),
     ].firstWhereOrNull(
       (it) => it.id == messageId,
     );