diff --git a/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java b/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java
index dea53a0..f92c056 100644
--- a/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java
+++ b/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java
@@ -234,10 +234,13 @@ public class FileEntityHandler implements RequestHandler {
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
             String sortBy = fileRequest.getSortBy() != null ? fileRequest.getSortBy() : "createdAt";
-            String sortOrder = fileRequest.getSortOrder().equalsIgnoreCase("desc") ? "desc" :
-                    "asc";
-            Sort sort = Sort.by(fileRequest.getSortOrder().equalsIgnoreCase("desc") ? Sort.Direction.DESC :
-                    Sort.Direction.ASC, sortBy);
+
+            String sortOrder = fileRequest.getSortOrder();
+            Sort.Direction direction = (sortOrder != null && sortOrder.equalsIgnoreCase("desc"))
+                    ? Sort.Direction.DESC
+                    : Sort.Direction.ASC;
+            Sort sort = Sort.by(direction, sortBy);
+
             Pageable pageable = PageRequest.of(page, pageSize, sort);
             FileResponse userFiles = fileEntityService.getUserFiles(userId, pageable, request.getVersion());