diff --git a/src/client/stores/CalculationStore/Effects/autorun.ts b/src/client/stores/CalculationStore/Effects/autorun.ts
index 86ca7d8..3a3edb6 100644
--- a/src/client/stores/CalculationStore/Effects/autorun.ts
+++ b/src/client/stores/CalculationStore/Effects/autorun.ts
@@ -127,8 +127,6 @@ const autorunEffects: IAutorunEffect[] = [
         'selectLeaseObjectCategory',
         ElementStatus.Default,
       );
-      calculationStore.setValidation('tbxCountSeats', undefined);
-      calculationStore.setValidation('tbxMaxMass', undefined);
       return;
     }
 
@@ -207,14 +205,14 @@ const autorunEffects: IAutorunEffect[] = [
   },
 
   calculationStore => () => {
+    calculationStore.setValidation('tbxCountSeats', true);
+    calculationStore.setValidation('tbxMaxMass', true);
+
     const { leaseObjectType: leaseObjectTypeId } = calculationStore.values;
     if (!leaseObjectTypeId) {
       return;
     }
 
-    calculationStore.setValidation('tbxCountSeats', undefined);
-    calculationStore.setValidation('tbxMaxMass', undefined);
-
     const leaseObjectType = calculationStore.options.selectLeaseObjectType?.find(
       x => x.evo_leasingobject_typeid === leaseObjectTypeId,
     );