Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rc774db57bc06b2dac2bf9aa268b8eab2294046d9 -r569fc4bd2ae5f45677aaf34816d7e01834c68708
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision c774db57bc06b2dac2bf9aa268b8eab2294046d9)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 569fc4bd2ae5f45677aaf34816d7e01834c68708)
@@ -162,8 +162,10 @@
         F32 const cp1Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1 ) - concentratePumps[ CONCENTRATEPUMPS_CP1 ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP1 ].currentPumpSpeed;
         F32 const cp2Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2 ) - concentratePumps[ CONCENTRATEPUMPS_CP2 ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP2 ].currentPumpSpeed;
 
+#ifndef DISABLE_DIALYSATE_CHECK
         checkPersistentAlarm( PERSISTENT_ALARM_CP1_SPEED_CONTROL_ERROR, cp1Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp1Error, CONCENTRATE_PUMP_ERROR_TOLERANCE );
         checkPersistentAlarm( PERSISTENT_ALARM_CP2_SPEED_CONTROL_ERROR, cp2Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp2Error, CONCENTRATE_PUMP_ERROR_TOLERANCE );
+#endif
 
         concentratePumpMonitorTimerCounter = 0U;
         broadcastConcentratePumpData( &data );
Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rc774db57bc06b2dac2bf9aa268b8eab2294046d9 -r569fc4bd2ae5f45677aaf34816d7e01834c68708
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision c774db57bc06b2dac2bf9aa268b8eab2294046d9)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 569fc4bd2ae5f45677aaf34816d7e01834c68708)
@@ -238,8 +238,10 @@
     BOOL const isPostAcidConductivityOutOfRange = ( postAcidConductivity <= CONCENTRATE_POST_ACID_MIN_CONDUCTIVITY ) || ( postAcidConductivity >= CONCENTRATE_POST_ACID_MAX_CONDUCTIVITY );
     BOOL const isPostBicarbConductivityOutOfRange = ( postBicarbonateConductivity <= CONCENTRATE_POST_BICARB_MIN_CONDUCTIVITY ) || ( postBicarbonateConductivity >= CONCENTRATE_POST_BICARB_MAX_CONDUCTIVITY );
 
+#ifndef DISABLE_DIALYSATE_CHECK
     checkPersistentAlarm( PERSISTENT_ALARM_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE, isPostAcidConductivityOutOfRange, postAcidConductivity, CONCENTRATE_POST_ACID_MIN_CONDUCTIVITY );
     checkPersistentAlarm( PERSISTENT_ALARM_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE, isPostBicarbConductivityOutOfRange, postBicarbonateConductivity, CONCENTRATE_POST_BICARB_MIN_CONDUCTIVITY );
+#endif
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rc774db57bc06b2dac2bf9aa268b8eab2294046d9 -r569fc4bd2ae5f45677aaf34816d7e01834c68708
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c774db57bc06b2dac2bf9aa268b8eab2294046d9)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 569fc4bd2ae5f45677aaf34816d7e01834c68708)
@@ -267,8 +267,10 @@
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1, acidCP1PumpFlowRate );
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2, bicarbCP2PumpFlowRate );
 
+#ifndef DISABLE_DIALYSATE_CHECK
     BOOL const isROPumpFlowRateOutOfRange = ( measuredROFlowRate <= FILL_MIN_RO_FLOW_RATE ) || ( measuredROFlowRate >= FILL_MAX_RO_FLOW_RATE );
     checkPersistentAlarm( PERSISTENT_ALARM_RO_PUMP_FLOW_RATE_OUT_OF_RANGE, isROPumpFlowRateOutOfRange, measuredROFlowRate, FILL_MIN_RO_FLOW_RATE );
+#endif
 }
 
 /**@}*/