Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -130,14 +130,13 @@
     // Reset treatment
     initTreatmentMode();
     initDialysis();
-
+    setCurrentSubState( NO_SUB_STATE );
     validTreatParamsReceived = FALSE;
     treatParamsConfirmed = FALSE;
     treatParamsRejected = FALSE;
     treatmentCancelled = FALSE;
 
     setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, 0.0 );
-    setCurrentSubState( NO_SUB_STATE );
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -600,9 +600,8 @@
  * @param none
  * @return none
  *************************************************************************/
-static void sendOperationStatusEvent()
+static void sendOperationStatusEvent( void )
 {
-
     EVENT_DATA_T dat1;
     EVENT_DATA_T dat2;
     U32 opData = ( (U08)currentMode +
Index: firmware/App/Modes/PreTreatmentRecirc.c
===================================================================
diff -u -rce64b7e15824641a6a6465c28eec5d8ec593f110 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/PreTreatmentRecirc.c	(.../PreTreatmentRecirc.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
+++ firmware/App/Modes/PreTreatmentRecirc.c	(.../PreTreatmentRecirc.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -84,6 +84,7 @@
 {
     initPreTreatmentRecirc();
     setupPreTreatmentRecirculate();
+    setCurrentSubState( (U32)currentPreTreatmentRecircState );
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -rce64b7e15824641a6a6465c28eec5d8ec593f110 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -192,7 +192,7 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
-
+    setCurrentSubState( (U32)currentPrimeState );
     doorClosedRequired( TRUE, TRUE );
 
     // Pumps should be off
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r139d7ba2733169cc738b6421eed50a7694691c0a -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 139d7ba2733169cc738b6421eed50a7694691c0a)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -295,7 +295,7 @@
     pumpHomingRequestedForNCST = FALSE;
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
-
+    setCurrentSubState( (U32)currentNoCartSelfTestsState );
     doorClosedRequired( TRUE, TRUE );
 
     // Pumps should be off
@@ -429,7 +429,7 @@
     selfTestPreviousPublishDataTime = getMSTimerCount();
     selfTestCartridgeSettleTime = getMSTimerCount();
     doorClosedRequired( FALSE, TRUE );
-
+    setCurrentSubState( (U32)currentDrySelfTestsState );
     // Pumps should be off
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -rce64b7e15824641a6a6465c28eec5d8ec593f110 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -114,7 +114,7 @@
     // Set user alarm recovery actions allowed in this sub-mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
-
+    setCurrentSubState( (U32)treatmentEndState );
     // Set valves, pumps and heater
     setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
     setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
Index: firmware/App/Modes/TreatmentRecirc.c
===================================================================
diff -u -rce64b7e15824641a6a6465c28eec5d8ec593f110 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
+++ firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -114,7 +114,7 @@
 void transitionToTreatmentRecirc( void )
 {
     initTreatmentRecirc();
-
+    setCurrentSubState( (U32)treatmentRecircState );
     doorClosedRequired( TRUE, TRUE );
 
     // Set valves to safe state
Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rce64b7e15824641a6a6465c28eec5d8ec593f110 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -85,7 +85,7 @@
 void transitionToTreatmentStop( void )
 {
     initTreatmentStop();
-
+    setCurrentSubState( (U32)currentTxStopState );
     // Set user alarm recovery actions allowed in this sub-mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );