Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -r46f1c9d2dc9f1a4e7bec856940178404905cd7e2 -r75f5cf4a8484f0c08b90edfb4b49a6268e51de65
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 46f1c9d2dc9f1a4e7bec856940178404905cd7e2)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 75f5cf4a8484f0c08b90edfb4b49a6268e51de65)
@@ -8,7 +8,7 @@
 * @file    ModeHeatDisinfectActiveCool.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      12-Jun-2023
+* @date    (last)      20-Jun-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  18-Dec-2022
@@ -788,6 +788,7 @@
             // If there is any fault alarm and we are not already in the cancel water path state, set it to cancel water path state
             heatDisinfectActiceCoolPrevState = heatDisinfectActiveCoolState;
             heatDisinfectActiveCoolState     = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE;
+            setHeatDisinfectActiveCoolActuators( heatDisinfectActiveCoolState );
         }
     }
 }
@@ -1031,8 +1032,13 @@
         case DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE:
         case DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_BASIC_PATH_STATE:
         case DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_COMPLETE:
-            // Do nothing the actuators in the above states are handled in a different part of code
+            // De-energize the actuators in the state upon transitioning to these states
+            deenergizeActuators( NO_PARK_CONC_PUMPS );
             break;
+
+        default:
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HEAT_DISINFECT_ACTIVE_COOL_INVALID_EXEC_STATE, state )
+            break;
     }
 }
 
@@ -1091,6 +1097,7 @@
 
         heatDisinfectActiceCoolPrevState = state;
         state                            = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE;
+        setHeatDisinfectActiveCoolActuators( state );
     }
 
     return state;