diff --git a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java
index cc839e3..58ec317 100644
--- a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java
+++ b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java
@@ -76,9 +76,15 @@ public class ViolationService {
         Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC,
                 "createdDate");
         Pageable pageable = PageRequest.of(page, size, sort);
+        Page<Violation> violations;
 
-        Page<Violation> violations = violationRepository.findByFileEntityInAndStatusNotAndCreatedDateBetween(
-                userFiles, ViolationStatus.NOT_OWNER_FILE.name(), start, end, pageable);
+        if (start == null || end == null) {
+            violations = violationRepository.findByFileEntityInAndStatusNot( userFiles,
+                    ViolationStatus.NOT_OWNER_FILE.name(),pageable);
+        } else {
+            violations = violationRepository.findByFileEntityInAndStatusNotAndCreatedDateBetween(
+                    userFiles, ViolationStatus.NOT_OWNER_FILE.name(), start, end, pageable);
+        }
 
         Map<String, List<Violation>> violationsByFileId = violations.getContent().stream()
                 .collect(Collectors.groupingBy(v -> v.getFileEntity().getId()));