Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r78f072a9cb6acc3a007171562f6e63efb8b9ae23 -r5b919b77ea248b5fec3511857ed910ecfc0a1955
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 78f072a9cb6acc3a007171562f6e63efb8b9ae23)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 5b919b77ea248b5fec3511857ed910ecfc0a1955)
@@ -7,8 +7,8 @@
 *
 * @file    Valves.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Nov-2022
+* @author  (last)      Darren Cox
+* @date    (last)      12-Jan-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  07-Aug-2020
@@ -1184,7 +1184,7 @@
     for ( valve = VDI; valve < NUM_OF_VALVES; valve++ )
     {
         // Check the valve is in Idle state, otherwise the position should not be checked
-        if ( valvesStatus[ valve ].execState == VALVE_STATE_IDLE )
+        if ( ( valvesStatus[ valve ].execState == VALVE_STATE_IDLE ) && ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST ) ) )
         {
             U32 maxDeviation = MAX_DEVIATION_FROM_TARGET_IN_COUNTS;
 
@@ -1216,6 +1216,10 @@
                 valvesStatus[ valve ].positionOutOfRangeCounter = 0;
             }
         }
+        else
+        {
+            valvesStatus[ valve ].positionOutOfRangeCounter = 0;
+        }
     }
 }