Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r51b924f03a4272f45bd69dfb0132e7dd07c6eaf9
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 51b924f03a4272f45bd69dfb0132e7dd07c6eaf9)
@@ -890,7 +890,7 @@
         state = VALVE_STATE_IDLE;
     }
     // Check if the valve's transition time has timed out
-    else if ( TRUE == didTimeout( valvesStatus[ valve ].transitionStartTime, VALVE_TRANSITION_TIMEOUT_MS ) )
+    else if ( ( TRUE == didTimeout( valvesStatus[ valve ].transitionStartTime, VALVE_TRANSITION_TIMEOUT_MS ) ) && ( FALSE == isACPowerLost() ) )
     {
         // Go back to Idle state
         state = VALVE_STATE_IDLE;