Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -rd0536d759cb33f099357033c3429401ff1637d26 -r1cff40f532b0cbdb367c519f063cad1dccc5264c
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision d0536d759cb33f099357033c3429401ff1637d26)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 1cff40f532b0cbdb367c519f063cad1dccc5264c)
@@ -1037,16 +1037,19 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
+        OPN_CLS_STATE_T concCap      = getSwitchStatus( CONCENTRATE_CAP );
+        OPN_CLS_STATE_T dialysateCap = getSwitchStatus( DIALYSATE_CAP );
+
         // If either the dialysate cap or the concentrate cap is open during any state, alarm
-        if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
+        if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == dialysateCap ) )
         {
             if ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_START )
             {
                 prevChemDisinfectFlushState = chemDisinfectFlushState;
                 chemDisinfectFlushState     = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH;
                 alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
 
-                if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+                if ( STATE_OPEN == concCap )
                 {
                     alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
                 }