diff --git a/src/main/java/ru/soune/nocopy/controller/ApiController.java b/src/main/java/ru/soune/nocopy/controller/ApiController.java
index de619ea..0e3c75a 100644
--- a/src/main/java/ru/soune/nocopy/controller/ApiController.java
+++ b/src/main/java/ru/soune/nocopy/controller/ApiController.java
@@ -363,7 +363,7 @@ public class ApiController {
                     .contentLength(fileSize)
                     .contentType(MediaType.parseMediaType(contentType))
                     .header(HttpHeaders.CONTENT_DISPOSITION,
-                            "attachment; filename=\"" + entityResponse.getOriginalFileName() + "\"")
+                            "attachment; filename=\"" + entityResponse.getFileName() + "\"")
                     .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 3507a7a..b91eca9 100644
--- a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
+++ b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
@@ -391,7 +391,7 @@ public class FileEntityService {
                 .protectStatus(fileEntity.getProtectionStatus().toString())
                 .fileName(fileEntity.getOriginalFileName().replace("." +
                         fileEntity.getFileExtension(), "") + "_nocopy_protected" +
-                        fileEntity.getFileExtension())
+                        "." + fileEntity.getFileExtension())
                 .ownerName(user.getFullName())
                 .ownerEmail(user.getEmail())
                 .ownerCompany(user.getCompanyName())