Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rc914eb443ee2679eb9fe3668119058ccc578437d -r24e8fcb5744724be72ea26bebd95ec594c2c26fe
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c914eb443ee2679eb9fe3668119058ccc578437d)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 24e8fcb5744724be72ea26bebd95ec594c2c26fe)
@@ -407,8 +407,8 @@
     F32 const measuredROFlowRate_mL_min = getMeasuredROFlowRate() * ML_PER_LITER;
     F32 const acidConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
     F32 const dialysateConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
-    BOOL const isAcidConductivityOutOfRange = ( acidConductivity <= MIN_ACID_CONCENTRATE_CONDUCTIVITY ) && ( MAX_ACID_CONCENTRATE_CONDUCTIVITY >= acidConductivity );
-    BOOL const isDialysateConductivityOutOfRange = ( dialysateConductivity <= MIN_DIALYSATE_CONDUCTIVITY ) && ( MAX_DIALYSATE_CONDUCTIVITY >= dialysateConductivity );
+    BOOL const isAcidConductivityOutOfRange = ( acidConductivity <= MIN_ACID_CONCENTRATE_CONDUCTIVITY ) || ( MAX_ACID_CONCENTRATE_CONDUCTIVITY >= acidConductivity );
+    BOOL const isDialysateConductivityOutOfRange = ( dialysateConductivity <= MIN_DIALYSATE_CONDUCTIVITY ) || ( MAX_DIALYSATE_CONDUCTIVITY >= dialysateConductivity );
 
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
@@ -480,8 +480,7 @@
         }
 
 #ifndef DISABLE_DIALYSATE_CHECK
-        if ( ( avgAcidConductivity < MIN_ACID_CONCENTRATE_CONDUCTIVITY ) || ( avgAcidConductivity > MAX_ACID_CONCENTRATE_CONDUCTIVITY ) ||
-             ( avgDialysateConductivity < MIN_DIALYSATE_CONDUCTIVITY ) || ( avgDialysateConductivity > MAX_DIALYSATE_CONDUCTIVITY ) )
+        if ( ( avgDialysateConductivity < MIN_DIALYSATE_CONDUCTIVITY ) || ( avgDialysateConductivity > MAX_DIALYSATE_CONDUCTIVITY ) )
         {
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT, avgAcidConductivity, avgDialysateConductivity );
         }