Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r782cbace651eebeccbbfd3e2f2b607436269ee7f -r8822f86705a24d1c7dd305b584a95ae3d3c406b8
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 782cbace651eebeccbbfd3e2f2b607436269ee7f)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 8822f86705a24d1c7dd305b584a95ae3d3c406b8)
@@ -389,6 +389,11 @@
     BOOL isPressureMax         = ( actualPressure >= MAX_ALLOWED_MEASURED_PRESSURE_PSI ? TRUE : FALSE );
     BOOL isDutyCylceOutOfRange = FALSE;
 
+    // The feedback voltage is on the 0V line so when the duty cycle is 0, the feedback is 2.5V
+    // The duty cycle is calculated by getting the 1 - (ratio of feedback / to the voltage at 0 percent duty cycle).
+    roPumpFeedbackDutyCyclePct.data = 1.0F - ( roFeedbackVoltage / ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE );
+    isDutyCylceOutOfRange           = ( fabs( getROFeedbackDutyCycle() - roPumpDutyCyclePctSet ) > ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE ? TRUE : FALSE );
+
     checkPersistentAlarm( ALARM_ID_DG_RO_PUMP_PRESSURE_OUT_OF_RANGE, isPressureMax, actualPressure, MAX_ALLOWED_MEASURED_PRESSURE_PSI );
 
     if ( ( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) > NEARLY_ZERO ) && ( VALVE_STATE_CLOSED == getValveStateName( VBF ) ) )
@@ -461,11 +466,6 @@
         if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
 #endif
         {
-            // The feedback voltage is on the 0V line so when the duty cycle is 0, the feedback is 2.5V
-            // The duty cycle is calculated by getting the 1 - (ratio of feedback / to the voltage at 0 percent duty cycle).
-            roPumpFeedbackDutyCyclePct.data = 1.0F - ( roFeedbackVoltage / ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE );
-            isDutyCylceOutOfRange           = ( fabs( getROFeedbackDutyCycle() - roPumpDutyCyclePctSet ) > ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE ? TRUE : FALSE );
-
             checkPersistentAlarm( ALARM_ID_DG_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, isDutyCylceOutOfRange, getROFeedbackDutyCycle(), roPumpDutyCyclePctSet );
 
             // Check if it the alarm has timed out and if the pump is supposed to be off but it is still on, activate the safety shutdown