diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java
index 20635d976..ee0891db9 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java
@@ -100,7 +100,7 @@ public class CompanyMapStore extends BusinessObjectMapStore<Company> {
         if (id == null)
             return null;
         List<CompanyInfo> results = jdbcTemplate.query(
-                "SELECT * FROM COMPANY_INFO WHERE company_id = ?", new Object[]{id}, // todo id=comapny.id? Или сделать отдельный ID?
+                "SELECT * FROM COMPANY_INFO WHERE id = ?", new Object[]{id}, // id=comapny_id
                 (rs, rowNum) -> {
                     CompanyInfo companyInfo = new CompanyInfo();
                     companyInfo.setId(rs.getObject("Id", Long.class));
@@ -126,7 +126,8 @@ public class CompanyMapStore extends BusinessObjectMapStore<Company> {
         if (onceObject == null) {
             log.warn("No row in table COMPANY_INFO where id={}. Create empty ", id);
             onceObject = new CompanyInfo();
-            onceObject.setCompanyId(id); // чтобы не потерять id
+            onceObject.setId(id); // чтобы не потерять id
+            onceObject.setCompanyId(id);
         }
         return onceObject;
     }