diff --git a/src/main/java/ru/soune/nocopy/entity/company/Company.java b/src/main/java/ru/soune/nocopy/entity/company/Company.java
index 6135ed8..60868f9 100644
--- a/src/main/java/ru/soune/nocopy/entity/company/Company.java
+++ b/src/main/java/ru/soune/nocopy/entity/company/Company.java
@@ -51,7 +51,7 @@ public class Company {
     @ToString.Exclude
     private List<User> users = new ArrayList<>();
 
-    @OneToOne(cascade = CascadeType.ALL)
+    @OneToOne(cascade = CascadeType.MERGE)
     @JoinColumn(name = "tariff_info_id")
     private TariffInfo tariffInfo;
 }
diff --git a/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java b/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java
index e82335c..db0336f 100644
--- a/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java
+++ b/src/main/java/ru/soune/nocopy/service/tariff/TariffInfoService.java
@@ -167,8 +167,17 @@ public class TariffInfoService {
     @Transactional
     public void linkCompanyTariffInfo(Long userId, TariffInfo tariffInfo) {
         User user = userRepository.findById(userId).orElse(null);
+        log.info("user: " + user);
+        log.info("user: " + user);
+        log.info("user: " + user);
+        log.info("user: " + user);
+        log.info("Company: " + user.getCompany());
+        log.info("Company: " + user.getCompany());
+        log.info("Company: " + user.getCompany());
+        log.info("Company: " + user.getCompany());
 
-        if (user != null && user.getCompany() != null) {
+
+        if (user.getCompany() != null) {
             Company company = user.getCompany();
             company.setTariffInfo(tariffInfo);