Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rf1d684e536e7911b356a5d35320c909a1016d3d0 -rd49b9342b9ae67284d9423224f96838f91f8a1aa
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f1d684e536e7911b356a5d35320c909a1016d3d0)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d49b9342b9ae67284d9423224f96838f91f8a1aa)
@@ -8,7 +8,7 @@
 * @file    ModeStandby.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      04-May-2023
+* @date    (last)      15-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -147,6 +147,7 @@
     resetDialInPumpRotorCount();
     resetPreLoadStatus();
     setVenousBubbleDetectionEnabled( FALSE );
+    setCurrentSubState( NO_SUB_STATE );
 
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
@@ -198,6 +199,15 @@
 
     handleDisinfectCancel( stop );
 
+    // if no active alarms anymore, restore to default valve states for standby mode
+    if ( ( FALSE == doesAlarmStatusIndicateStop() ) && ( VALVE_POSITION_C_CLOSE == getValvePosition( VDI ) ) )
+    {
+        setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
+        setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
+        setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
+        setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
+    }
+
     // State machine to get DG to prep a reservoir so we can start a treatment
     switch ( currentStandbyState )
     {
@@ -354,7 +364,27 @@
  *************************************************************************/
 void signalAlarmActionToStandbyMode( ALARM_ACTION_T action )
 {
-    // Alarm actions not handled in Standby mode
+    switch ( action )
+    {
+        case ALARM_ACTION_STOP:
+            // Pumps should be off
+            signalBloodPumpHardStop();
+            signalDialInPumpHardStop();
+            signalDialOutPumpHardStop();
+            stopSyringePump();
+
+            // Set valves to safe positions
+            setValveAirTrap( STATE_CLOSED );
+            setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
+            break;
+
+        default:
+            // do not handle other actions in standby mode
+            break;
+    }
 }
 
 /*********************************************************************//**