diff --git a/.eslintrc.json b/.eslintrc.json
index d0b495f..428a986 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -75,7 +75,8 @@
       }
     ],
     "import/no-unresolved": "warn",
-    "implicit-arrow-linebreak": "warn"
+    "implicit-arrow-linebreak": "warn",
+    "operator-linebreak": "warn"
   },
   "overrides": [
     // Only uses Testing Library lint rules in test files
diff --git a/Components/Output/Validation.jsx b/Components/Output/Validation.jsx
index 43db968..ac74c9a 100644
--- a/Components/Output/Validation.jsx
+++ b/Components/Output/Validation.jsx
@@ -3,7 +3,6 @@ import { observer } from 'mobx-react-lite';
 import { useStore } from 'stores/hooks';
 import styled from 'styled-components';
 import { Box, Flex } from 'UIKit/grid';
-import titles from '../Calculation/config/elements-titles';
 
 const Bold = styled.span`
   font-weight: bold;
@@ -20,13 +19,12 @@ function Message(title, text) {
 }
 
 function getElementsErrors($calculation) {
-  const { elementsErrors } = $calculation.$validation;
-  const errors = Object.keys(elementsErrors).map((elementName) => {
-    const elementErrors = elementsErrors[elementName];
-    const elementTitle = titles[elementName];
+  const errors = Object.values($calculation.$validation).map((validation) => {
+    const elementErrors = validation.getMessages();
+    const elementTitle = validation.params.err_title;
 
     return elementErrors.map((error) => (
-      <Alert key={error.name} type="error" showIcon message={Message(elementTitle, error.text)} />
+      <Alert key={error.name} type="error" showIcon message={Message(elementTitle, error)} />
     ));
   });
 
diff --git a/process/calculate/reactions/validation.ts b/process/calculate/reactions/validation.ts
index c13cc6f..684f10e 100644
--- a/process/calculate/reactions/validation.ts
+++ b/process/calculate/reactions/validation.ts
@@ -6,7 +6,9 @@ export default function validationReactions(store: RootStore, apolloClient: Apol
   const { $calculation, $tables } = store;
   reaction(
     () => {
-      const hasElementsErrors = $calculation.$validation.hasErrors;
+      const hasElementsErrors = Object.values($calculation.$validation).every(
+        (validation) => validation.hasErrors
+      );
       const hasPaymentsErrors = $tables.payments.validation.hasErrors;
       const hasInsuranceErrors = $tables.insurance.validation.hasErrors;
       const hasFingapErrors = $tables.fingap.validation.hasErrors;
diff --git a/stores/calculation/index.ts b/stores/calculation/index.ts
index 7278248..12eea84 100644
--- a/stores/calculation/index.ts
+++ b/stores/calculation/index.ts
@@ -1,24 +1,26 @@
 /* eslint-disable import/no-cycle */
+import titles from 'Components/Calculation/config/elements-titles';
 import type * as Values from 'Components/Calculation/config/map/values';
 import { getValueName } from 'Components/Calculation/config/map/values';
 import type { BaseOption } from 'Elements/types';
+import { observable } from 'mobx';
 import type RootStore from 'stores/root';
+import Validation from 'stores/validation';
 import OptionsStore from './options';
 import StatusStore from './statuses';
-import ValidationStore from './validation';
 import ValuesStore from './values';
 
 export default class CalculationStore {
   $values: ValuesStore;
   $status: StatusStore;
   $options: OptionsStore;
-  $validation: ValidationStore;
+  $validation: Partial<Record<Values.Elements, Validation>>;
 
   constructor(rootStore: RootStore) {
     this.$values = new ValuesStore(rootStore);
     this.$status = new StatusStore(rootStore);
     this.$options = new OptionsStore(rootStore);
-    this.$validation = new ValidationStore(rootStore);
+    this.$validation = observable.object({});
   }
 
   element = <E extends Values.Elements>(elementName: E) => ({
@@ -28,7 +30,7 @@ export default class CalculationStore {
 
       this.$options.resetOptions(elementName);
       this.$status.resetStatus(elementName);
-      this.$validation.clearErrors(elementName);
+      this.$validation[elementName]?.clearErrors();
 
       return this.element(elementName);
     },
@@ -83,5 +85,20 @@ export default class CalculationStore {
 
       return this.element(elementName);
     },
+
+    addError: (message: string) => {
+      if (!this.$validation[elementName]) {
+        this.$validation[elementName] = new Validation({
+          err_key: elementName,
+          err_title: titles[elementName],
+        });
+      }
+
+      return this.$validation[elementName]?.addError(message);
+    },
+
+    cleanErrors: () => {
+      this.$validation[elementName]?.clearErrors();
+    },
   });
 }
diff --git a/stores/calculation/options/index.ts b/stores/calculation/options/index.ts
index 2bbe7e1..cb829a8 100644
--- a/stores/calculation/options/index.ts
+++ b/stores/calculation/options/index.ts
@@ -32,7 +32,6 @@ export default class OptionsStore {
      */
     const value = this.root.$calculation.element(elementName).getValue();
     if (
-      // eslint-disable-next-line operator-linebreak
       !this.options[elementName]?.length ||
       !this.options[elementName].some((x) => x.value === value)
     ) {
diff --git a/stores/calculation/validation/hooks.js b/stores/calculation/validation/hooks.js
index 61aeea7..fdf8120 100644
--- a/stores/calculation/validation/hooks.js
+++ b/stores/calculation/validation/hooks.js
@@ -3,10 +3,16 @@ import { useStore } from 'stores/hooks';
 
 export function useValidation(elementName) {
   const { $calculation } = useStore();
-  const validationResult = $calculation.$validation.getValidation(elementName);
+  const messages = $calculation.$validation[elementName]?.getMessages();
+
+  if (messages?.length) {
+    return {
+      isValid: false,
+      help: 'Некорректные данные',
+    };
+  }
 
   return {
-    ...validationResult,
-    help: validationResult?.isValid === false ? 'Некорректные данные' : null,
+    isValid: true,
   };
 }
diff --git a/stores/calculation/validation/index.ts b/stores/calculation/validation/index.ts
deleted file mode 100644
index 64fa0c7..0000000
--- a/stores/calculation/validation/index.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/* eslint-disable object-curly-newline */
-import titles from 'Components/Calculation/config/elements-titles';
-import type { Elements } from 'Components/Calculation/config/map/values';
-import notification from 'Elements/notification';
-import { makeAutoObservable, observable } from 'mobx';
-import type RootStore from 'stores/root';
-import type { ElementsErrors, Error } from './types';
-
-export default class ValidationStore {
-  root: RootStore;
-  elementsErrors: Partial<ElementsErrors> = {};
-
-  constructor(rootStore: RootStore) {
-    makeAutoObservable(this);
-    this.root = rootStore;
-  }
-
-  get hasErrors() {
-    return (Object.keys(this.elementsErrors) as Elements[]).some(
-      (elementName) => this.elementsErrors[elementName]?.length
-    );
-  }
-
-  getValidation(elementName: Elements) {
-    return {
-      isValid: !this.elementsErrors[elementName]?.length,
-      errors: this.elementsErrors[elementName]?.map((x) => x.text),
-    };
-  }
-
-  addError = (elementName: Elements, error: Error) => {
-    if (!this.elementsErrors[elementName]) this.elementsErrors[elementName] = observable([]);
-
-    const errorIndex = this.elementsErrors[elementName]?.findIndex((x) => x.name === error.name);
-    const hasError = errorIndex !== undefined && errorIndex !== -1;
-
-    if (!hasError) {
-      this.elementsErrors[elementName]?.push(error);
-    } else {
-      this.elementsErrors[elementName]?.splice(errorIndex, 1, error);
-    }
-
-    notification.error({
-      key: error.name,
-      message: `${titles[elementName]}`,
-      description: error.text,
-    });
-
-    return () => this.#removeError(elementName, error.name);
-  };
-
-  #removeError = (elementName: Elements, errorName: Error['name']) => {
-    const errorIndex = this.elementsErrors[elementName]?.findIndex((x) => x.name === errorName);
-    if (errorIndex) this.elementsErrors[elementName]?.splice(errorIndex, 1);
-  };
-
-  clearErrors = (elementName: Elements) => {
-    this.elementsErrors[elementName]?.clear();
-  };
-}
diff --git a/stores/calculation/validation/types.ts b/stores/calculation/validation/types.ts
deleted file mode 100644
index 7917c33..0000000
--- a/stores/calculation/validation/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type { Elements } from 'Components/Calculation/config/map/values';
-import type { IObservableArray } from 'mobx';
-
-export type Error = { name: string; text: string };
-export type ElementsErrors = Record<Elements, IObservableArray<Error>>;
diff --git a/stores/tables/fingap/index.ts b/stores/tables/fingap/index.ts
index 857adc3..0c01586 100644
--- a/stores/tables/fingap/index.ts
+++ b/stores/tables/fingap/index.ts
@@ -2,7 +2,7 @@ import type * as FinGAP from 'Components/Calculation/Form/Insurance/FinGAPTable/
 import type { IObservableArray } from 'mobx';
 import { makeAutoObservable, observable } from 'mobx';
 import type RootStore from 'stores/root';
-import Validation from '../validation';
+import Validation from '../../validation';
 
 export default class FinGAPTable {
   root: RootStore;
diff --git a/stores/tables/insurance/index.ts b/stores/tables/insurance/index.ts
index 5695445..89192dd 100644
--- a/stores/tables/insurance/index.ts
+++ b/stores/tables/insurance/index.ts
@@ -3,7 +3,7 @@ import type * as Insurance from 'Components/Calculation/Form/Insurance/Insurance
 import * as insuranceTableConfig from 'config/tables/insurance-table';
 import { makeAutoObservable } from 'mobx';
 import type RootStore from 'stores/root';
-import Validation from '../validation';
+import Validation from '../../validation';
 
 export interface InsuranceTableData {
   values?: Insurance.RowValues[];
diff --git a/stores/tables/payments/index.ts b/stores/tables/payments/index.ts
index d3c0eed..5ac08d0 100644
--- a/stores/tables/payments/index.ts
+++ b/stores/tables/payments/index.ts
@@ -3,7 +3,7 @@ import type { IObservableArray } from 'mobx';
 import { makeAutoObservable, observable, reaction } from 'mobx';
 
 import type RootStore from 'stores/root';
-import Validation from '../validation';
+import Validation from '../../validation';
 import type { Row } from './types';
 
 export default class PaymentsTable {
diff --git a/stores/tables/validation.ts b/stores/validation.ts
similarity index 100%
rename from stores/tables/validation.ts
rename to stores/validation.ts