diff --git a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
index bb5a9c8..5120647 100644
--- a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
+++ b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
@@ -374,12 +374,12 @@ public class FileEntityService {
     private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) {
         boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath());
         User user = userRepository.findById(fileEntity.getUserId()).get();
+        String[] splitName = fileEntity.getOriginalFileName().split(".");
 
         return FileEntityResponse.builder()
                 .id(fileEntity.getId())
                 .userId(fileEntity.getUserId())
-                .originalFileName(fileEntity.getOriginalFileName().replace("." +
-                        fileEntity.getFileExtension(), "") + "." + fileEntity.getFileExtension())
+                .originalFileName(splitName[0] + "_nocopy_protected" + "." + fileEntity.getFileExtension())
                 .storedFileName(fileEntity.getStoredFileName())
                 .filePath(fileEntity.getProtectedFilePath())
                 .fileSize(fileEntity.getFileSize())
@@ -395,9 +395,7 @@ public class FileEntityService {
                 .existsOnDisk(existsOnDisk)
                 .supportId(fileEntity.getSupportId())
                 .protectStatus(fileEntity.getProtectionStatus().toString())
-                .fileName(fileEntity.getOriginalFileName().replace("." +
-                        fileEntity.getFileExtension(), "") + "_nocopy_protected" +
-                        "." + fileEntity.getFileExtension())
+                .fileName(splitName[0] + "_nocopy_protected" + "." + fileEntity.getFileExtension())
                 .ownerName(user.getFullName())
                 .ownerEmail(user.getEmail())
                 .ownerCompany(user.getCompanyName())