diff --git a/src/main/java/ru/soune/nocopy/controller/ApiController.java b/src/main/java/ru/soune/nocopy/controller/ApiController.java
index 53d4e99..de619ea 100644
--- a/src/main/java/ru/soune/nocopy/controller/ApiController.java
+++ b/src/main/java/ru/soune/nocopy/controller/ApiController.java
@@ -357,15 +357,13 @@ public class ApiController {
                         MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
                         errorData));
             }
-
-            String contentType = determineContentType(filePath);
+                String contentType = determineContentType(filePath);
 
             return ResponseEntity.ok()
                     .contentLength(fileSize)
                     .contentType(MediaType.parseMediaType(contentType))
                     .header(HttpHeaders.CONTENT_DISPOSITION,
-                            "attachment; filename=\"" + entityResponse.getOriginalFileName() +
-                                    "_nocopy_protected" + "\"")
+                            "attachment; filename=\"" + entityResponse.getOriginalFileName() + "\"")
                     .body(resource);
         } catch (FileEntityNotFoundException e) {
             Map<String, Object> errorData = new HashMap<>();
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 9e445f5..3507a7a 100644
--- a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
+++ b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
@@ -389,7 +389,9 @@ public class FileEntityService {
                 .existsOnDisk(existsOnDisk)
                 .supportId(fileEntity.getSupportId())
                 .protectStatus(fileEntity.getProtectionStatus().toString())
-                .fileName(fileEntity.getOriginalFileName())
+                .fileName(fileEntity.getOriginalFileName().replace("." +
+                        fileEntity.getFileExtension(), "") + "_nocopy_protected" +
+                        fileEntity.getFileExtension())
                 .ownerName(user.getFullName())
                 .ownerEmail(user.getEmail())
                 .ownerCompany(user.getCompanyName())