Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rc0160362dc799802ec589d5b6cf4c2bd1face77e -r97e0100921ccad633b39b509a93a7237e4d80446
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision c0160362dc799802ec589d5b6cf4c2bd1face77e)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 97e0100921ccad633b39b509a93a7237e4d80446)
@@ -557,8 +557,10 @@
     // then the data is not stored in the NV memory or it was corrupted.
     if ( 0 == acidCalRecord.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].calibrationTime )
     {
+#ifndef SKIP_CAL_CHECK
         activateAlarmNoData( ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD );
         status = FALSE;
+#endif
     }
 
     // NOTE: Right now only acid concentrate 1 is used, therefore there is no for loop
@@ -574,8 +576,10 @@
     // Check the validity of the bicarb concentrate values
     if ( 0 == bicarbCalRecord.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].calibrationTime )
     {
+#ifndef SKIP_CAL_CHECK
         activateAlarmNoData( ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
         status = FALSE;
+#endif
     }
 
     // NOTE: Right now only bicarb concentrate 1 is used, therefore there is no for loop