Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -raa8dbad6005f0f63b846673ac1656b003fbf85e3 -r674e18b10904e97f4b2624b826abc21f3220dd32
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision aa8dbad6005f0f63b846673ac1656b003fbf85e3)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 674e18b10904e97f4b2624b826abc21f3220dd32)
@@ -267,10 +267,8 @@
 {
 #ifndef DISABLE_RO_RATIO_CHECK
     F32 cpo                    = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
-    BOOL isRORectionOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ? TRUE : FALSE );
+    BOOL isRORectionOutOfRange = ( ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ) || ( cpo >= MAX_CPO_CONDUCTIVITY_ALLOW ) ? TRUE : FALSE );
 
-    //BOOL isRORejRatioOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ) || ( cpo >= MAX_CPO_CONDUCTIVITY_ALLOW ); // TODO why is conductivity checked here again?
-
     // Fault alarm per PRS 483
     checkPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, isRORectionOutOfRange, roRejectionRatio, MAX_RO_REJECTION_RATIO_ALLOW );
 #endif