diff --git a/lib/controllers/chat_message_controller.dart b/lib/controllers/chat_message_controller.dart
index 5e1fb5e..ec7e495 100644
--- a/lib/controllers/chat_message_controller.dart
+++ b/lib/controllers/chat_message_controller.dart
@@ -322,6 +322,7 @@ class ChatMessageController extends ChangeNotifier {
     notifyListeners();
 
     final mostRecentMessage = await (_dt.db.snLocalChatMessage.select()
+          ..where((e) => e.channelId.equals(channel!.id))
           ..limit(1)
           ..orderBy([
             (e) =>