Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r4e9b962e7cb3c0b477462756a32214118b10fc16 -r802a590448df6a6cdd949f9a433559d7be89c034
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 4e9b962e7cb3c0b477462756a32214118b10fc16)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 802a590448df6a6cdd949f9a433559d7be89c034)
@@ -297,6 +297,9 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
+
+    //Set substate for event
+    setCurrentSubState( (U32)currentDialysisState );
 }
 
 /*********************************************************************//**
@@ -792,6 +795,7 @@
 
     if ( priorSubState != currentUFState )
     {
+        setCurrent4thLevelState( currentUFState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentUFState );
     }
 
@@ -838,6 +842,7 @@
 
     if ( priorSubState != currentSalineBolusState )
     {
+        setCurrent4thLevelState( currentSalineBolusState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentSalineBolusState );
     }
 
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r5fcae5901d466789c329256f5532cf64be549c83 -r802a590448df6a6cdd949f9a433559d7be89c034
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 5fcae5901d466789c329256f5532cf64be549c83)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 802a590448df6a6cdd949f9a433559d7be89c034)
@@ -153,7 +153,7 @@
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
     signalDialInPumpHardStop();
-    setCurrentSubState( NO_SUB_STATE );
+    setCurrentSubState( (U32)currentDrainReservoirState );
     collectTreatmentLogData();
 
     exitBloodLeakNormalState();
Index: firmware/App/Modes/PreTreatmentRecirc.c
===================================================================
diff -u -r5fcae5901d466789c329256f5532cf64be549c83 -r802a590448df6a6cdd949f9a433559d7be89c034
--- firmware/App/Modes/PreTreatmentRecirc.c	(.../PreTreatmentRecirc.c)	(revision 5fcae5901d466789c329256f5532cf64be549c83)
+++ firmware/App/Modes/PreTreatmentRecirc.c	(.../PreTreatmentRecirc.c)	(revision 802a590448df6a6cdd949f9a433559d7be89c034)
@@ -68,7 +68,6 @@
     preTxRecircStartTime = getMSTimerCount();
     recircTOWarningGiven = FALSE;
     recircTOAlarmGiven = FALSE;
-    setCurrent4thLevelState( NO_SUB_STATE );
     resetPreTreatmentRecircFlags();
 }
 
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r1354685cce00d343e29be2c098fd9fdb857374ae -r802a590448df6a6cdd949f9a433559d7be89c034
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 1354685cce00d343e29be2c098fd9fdb857374ae)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 802a590448df6a6cdd949f9a433559d7be89c034)
@@ -979,6 +979,7 @@
 
     if ( TRUE == isWetSelfTestsPassed() )
     {
+        setCurrent4thLevelState( NO_SUB_STATE );
         state = HD_PRIME_COMPLETE;
     }
     else if ( TRUE == doesAlarmStatusIndicateStop() )
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r38355442b06187fe5d57deca647b3adf2fa26b89 -r802a590448df6a6cdd949f9a433559d7be89c034
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 38355442b06187fe5d57deca647b3adf2fa26b89)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 802a590448df6a6cdd949f9a433559d7be89c034)
@@ -115,6 +115,7 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
     setCurrentSubState( (U32)treatmentEndState );
+    setCurrent4thLevelState( NO_SUB_STATE );
     // Set valves, pumps and heater
     setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
     setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r38355442b06187fe5d57deca647b3adf2fa26b89 -r802a590448df6a6cdd949f9a433559d7be89c034
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 38355442b06187fe5d57deca647b3adf2fa26b89)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 802a590448df6a6cdd949f9a433559d7be89c034)
@@ -86,6 +86,7 @@
 {
     initTreatmentStop();
     setCurrentSubState( (U32)currentTxStopState );
+    setCurrent4thLevelState( NO_SUB_STATE );
     // Set user alarm recovery actions allowed in this sub-mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );