diff --git a/DeviceStorage.c b/DeviceStorage.c
index b2d7c15..9f97131 100644
--- a/DeviceStorage.c
+++ b/DeviceStorage.c
@@ -27,7 +27,7 @@ bool DeviceStorage_LoadParam(tDeviceStorage *env) {
     bool isLoad = VarsTabDumpObserverParam_Load(&env->dumpObserver);
 
     if (isLoad) {
-        if (env->dataParam->version == DEVICE_DATA_NO_VOLATILE_VERSION) {
+        if (env->dataParam->version_param == DEVICE_DATA_VERSION_PARAM) {
             LoggerInfoStatic(LOGGER, LOG_SIGN, "Parameters loaded successfully");
             return true;
         }
@@ -46,16 +46,24 @@ bool DeviceStorage_LoadCalib(tDeviceStorage *env) {
     bool isLoad = VarsTabDumpObserverCalib_Load(&env->dumpObserver);
 
     if (isLoad) {
-        LoggerInfoStatic(LOGGER, LOG_SIGN, "Calibrations loaded successfully");
-        return true;
+        if (env->dataParam->version_calib == DEVICE_DATA_VERSION_CALIB) {
+            LoggerInfoStatic(LOGGER, LOG_SIGN, "Calibrations loaded successfully");
+            return true;
+        }
     }
 
     LoggerInfoStatic(LOGGER, LOG_SIGN, "Calibrations: Reset settings");
 
     DeviceDataCalib_InitDefaults(env->dataCalib);
 
-    return VarsTabDumpObserverCalib_Dump(&env->dumpObserver);
+    bool resultParam = VarsTabDumpObserverParam_Dump(&env->dumpObserver);
+    bool resultCalib = VarsTabDumpObserverCalib_Dump(&env->dumpObserver);
 
+    if ((resultParam) || (resultCalib)) {
+        return true;
+    }
+
+    return false;
 }
 
 void DeviceStorage_ForceDump(tDeviceStorage *env) {