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 );
     }