diff --git a/internal/repository/letter_repository.go b/internal/repository/letter_repository.go
index e18c39d..786c702 100644
--- a/internal/repository/letter_repository.go
+++ b/internal/repository/letter_repository.go
@@ -197,11 +197,18 @@ 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)
+	//	} else {
+	//		dataQuery = dataQuery.Where("letter_incoming_recipients.is_archived = ? OR letter_incoming_recipients.is_archived IS NULL", false)
+	//	}
+	//}
 	if filter.IsArchived != nil {
 		if *filter.IsArchived {
-			query = query.Where("letters_incoming.is_archived = ?", true)
+			dataQuery = dataQuery.Where("letters_incoming.is_archived = ?", true)
 		} else {
-			query = query.Where("letters_incoming.is_archived = ? OR letters_incoming.is_archived IS NULL", false)
+			dataQuery = dataQuery.Where("letters_incoming.is_archived = ? OR letters_incoming.is_archived IS NULL", false)
 		}
 	}