diff --git a/internal/repository/letter_repository.go b/internal/repository/letter_repository.go
index 71a2da8..e18c39d 100644
--- a/internal/repository/letter_repository.go
+++ b/internal/repository/letter_repository.go
@@ -199,9 +199,9 @@ func (r *LetterIncomingRepository) List(ctx context.Context, filter ListIncoming
 	// Apply is_archived filter based on recipient's is_archived field
 	if filter.IsArchived != nil {
 		if *filter.IsArchived {
-			dataQuery = dataQuery.Where("letter_incoming_recipients.is_archived = ?", true)
+			query = query.Where("letters_incoming.is_archived = ?", true)
 		} else {
-			dataQuery = dataQuery.Where("letter_incoming_recipients.is_archived = ? OR letter_incoming_recipients.is_archived IS NULL", false)
+			query = query.Where("letters_incoming.is_archived = ? OR letters_incoming.is_archived IS NULL", false)
 		}
 	}