diff --git a/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java b/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java
index c335b05..4a8199c 100644
--- a/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java
+++ b/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java
@@ -233,8 +233,8 @@ public class FileEntityHandler implements RequestHandler {
             Long userId = authService.useUserAuthToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
-            String sortBy = fileRequest.getSortBy() != null || !fileRequest.getSortBy().isEmpty() ?
-                    fileRequest.getSortBy() : "createdAt";
+            String fileRequestSortBy = fileRequest.getSortBy();
+            String sortBy = !fileRequestSortBy.equals("") ? fileRequest.getSortBy(): "createdAt";
 
             String sortOrder = fileRequest.getSortOrder();
             Sort.Direction direction = (sortOrder != null && sortOrder.equalsIgnoreCase("desc"))