diff --git a/src/main/java/ru/soune/nocopy/entity/notification/NotificationMessage.java b/src/main/java/ru/soune/nocopy/entity/notification/NotificationMessage.java
index 2fb71ba..0085299 100644
--- a/src/main/java/ru/soune/nocopy/entity/notification/NotificationMessage.java
+++ b/src/main/java/ru/soune/nocopy/entity/notification/NotificationMessage.java
@@ -4,7 +4,7 @@ import lombok.Getter;
 
 @Getter
 public enum NotificationMessage {
-    FILE_SEARCH("notification-file-search");
+    FILE_SEARCH("notification.file.search");
 
     private final String messageKey;
 
diff --git a/src/main/java/ru/soune/nocopy/entity/notification/NotificationType.java b/src/main/java/ru/soune/nocopy/entity/notification/NotificationType.java
index 156a582..159fe35 100644
--- a/src/main/java/ru/soune/nocopy/entity/notification/NotificationType.java
+++ b/src/main/java/ru/soune/nocopy/entity/notification/NotificationType.java
@@ -4,24 +4,24 @@ import lombok.Getter;
 
 @Getter
 public enum NotificationType {
-    SEARCH_RESULT("notification-search-result"),
-    MONITORING_RESULT("notification-monitoring-result"),
-    OPERATION_IMPOSSIBLE("notification-operation-impossible"),
-    START_FAILED_NOW("notification-start-failed-now"),
-    START_FAILED_NEXT("notification-start-failed-next"),
-    PAYOUT_RESULT("notification-payout-result"),
-    PAYMENT_RESULT("notification-payment-result"),
-    REFERRAL_DEPOSIT("notification-referral-deposit"),
-    REFERRAL_REGISTERED("notification-referral-registered"),
-    REFERRAL_ACTIVATED("notification-referral-activated"),
-    COMPLAINT_STATUS_CHANGED("notification-complaint-status"),
-    CASE_STATUS_CHANGED("notification-case-status"),
-    INCOMING_MESSAGE("notification-incoming-message"),
-    TARIFF_EXPIRING("notification-tariff-expiring"),
-    TOKEN_NOT_FOUND("notification-token-not-found"),
-    FILE_MODERATION_EVENT("notification-file-moderation"),
-    FILE_ADDED_TO_SYSTEM("notification-file-added"),
-    SEARCH_OPERATION_FAILED("notification-search-operation-filed");
+    SEARCH_RESULT("notification.search.result"),
+    MONITORING_RESULT("notification.monitoring.result"),
+    OPERATION_IMPOSSIBLE("notification.operation.impossible"),
+    START_FAILED_NOW("notification.start.failed.now"),
+    START_FAILED_NEXT("notification.start.failed.next"),
+    PAYOUT_RESULT("notification.payout.result"),
+    PAYMENT_RESULT("notification.payment.result"),
+    REFERRAL_DEPOSIT("notification.referral.deposit"),
+    REFERRAL_REGISTERED("notification.referral.registered"),
+    REFERRAL_ACTIVATED("notification.referral.activated"),
+    COMPLAINT_STATUS_CHANGED("notification.complaint.status"),
+    CASE_STATUS_CHANGED("notification.case.status"),
+    INCOMING_MESSAGE("notification.incoming.message"),
+    TARIFF_EXPIRING("notification.tariff.expiring"),
+    TOKEN_NOT_FOUND("notification.token.not.found"),
+    FILE_MODERATION_EVENT("notification.file.moderation"),
+    FILE_ADDED_TO_SYSTEM("notification.file.added"),
+    SEARCH_OPERATION_FAILED("notification.search.operation.filed");
 
     private final String messageKey;
 
diff --git a/src/main/java/ru/soune/nocopy/service/notification/NotificationService.java b/src/main/java/ru/soune/nocopy/service/notification/NotificationService.java
index d757f8a..d7567b5 100644
--- a/src/main/java/ru/soune/nocopy/service/notification/NotificationService.java
+++ b/src/main/java/ru/soune/nocopy/service/notification/NotificationService.java
@@ -34,16 +34,12 @@ public class NotificationService {
 
     @Transactional
     public void addNotification(NotificationType notificationType, long userId, Object... args) {
-        Locale locale = Locale.forLanguageTag("ru");
-
-        String message = messageSource.getMessage(notificationType.getMessageKey(), args, locale);
-
         Notification notification = Notification.builder()
                 .notificationType(notificationType)
                 .createdAt(LocalDateTime.now())
                 .user(userRepository.findById(userId).orElseThrow())
                 .status(NotificationStatus.NEW)
-                .message(message)
+                .message(notificationType.getMessageKey())
                 .build();
 
         notificationRepository.save(notification);