Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r8aa885b17330f096934f175d35912c3c95825039 -ra6737c3bcc8286c153b778c2c395f465e76aaafb
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 8aa885b17330f096934f175d35912c3c95825039)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision a6737c3bcc8286c153b778c2c395f465e76aaafb)
@@ -7,20 +7,22 @@
 *
 * @file    ModeFault.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      16-Sep-2025
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      30-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
 *
 ***************************************************************************/
 
+#include "BalancingChamber.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
 #include "Heaters.h"
 #include "ModeFault.h"
 #include "Messaging.h"
 #include "OperationModes.h"
+#include "RinsePump.h"
 #include "SafetyShutdown.h"
 #include "Utilities.h"
 #include "Valves.h"
@@ -74,6 +76,8 @@
 {
     initFaultMode();
     setCurrentSubState( NO_SUB_STATE );
+    // Deactivate Balancing Chamber Switching
+    requestBalChamberSwitching( FALSE );
     // Publish POST failure status to UI if fault triggered in Init/POST mode
     if ( DD_MODE_INIT == getPreviousOperationMode() )
     {
@@ -200,6 +204,7 @@
     requestConcentratePumpOff( D76_PUMP, parkPumps );
     signalDialysatePumpHardStop( D12_PUMP );
     signalDialysatePumpHardStop( D48_PUMP );
+    setRinsePumpState( RINSE_PUMP_STATE_OFF );
     stopHeater( D5_HEAT );
     stopHeater( D45_HEAT );
 }
@@ -248,6 +253,7 @@
     requestConcentratePumpOff( D76_PUMP, parkPumps );
     signalDialysatePumpHardStop( D12_PUMP );
     signalDialysatePumpHardStop( D48_PUMP );
+    setRinsePumpState( RINSE_PUMP_STATE_OFF );
     stopHeater( D5_HEAT );
     stopHeater( D45_HEAT );
 }