diff --git a/lib/src/database/daos/messages_dao.dart b/lib/src/database/daos/messages_dao.dart
index e1e1775..4b49da8 100644
--- a/lib/src/database/daos/messages_dao.dart
+++ b/lib/src/database/daos/messages_dao.dart
@@ -26,6 +26,7 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
           ..where((t) =>
               t.openedAt.isNull() &
               t.contactId.equals(contactId) &
+              t.messageOtherId.isNotNull() &
               t.kind.equals(MessageKind.media.name))
           ..orderBy([(t) => OrderingTerm.desc(t.sendAt)]))
         .watch();