Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra3e3feea8cfb6a1e0137bf09031f0484a3c73332 -rb1b5e8659de8f6109c4d77cda98308d1fd9ef165
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a3e3feea8cfb6a1e0137bf09031f0484a3c73332)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision b1b5e8659de8f6109c4d77cda98308d1fd9ef165)
@@ -209,6 +209,7 @@
 
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, !isDialysateConductivityGood ) )
     {
+#ifndef DISABLE_DIALYSATE_CHECK
         if ( FALSE == isAcidConductivityInRange() )
         {
             SET_ALARM_WITH_1_F32_DATA( ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR ) );
@@ -217,6 +218,7 @@
         {
             SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR ) );
         }
+#endif
     }
 
     if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, !isDialysateConductivityGood ) )
@@ -271,7 +273,9 @@
 
     handleDialysateMixing();
 
+#ifndef DISABLE_DIALYSATE_CHECK
     if ( TRUE == isBicarbConductivityInRange() )
+#endif
     {
         concentrateTestStartTime = getMSTimerCount();
         requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
@@ -302,7 +306,9 @@
 
     handleDialysateMixing();
 
+#ifndef DISABLE_DIALYSATE_CHECK
     if ( TRUE == isAcidConductivityInRange() )
+#endif
     {
         requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
         requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );