Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r2cc90affe213bf8485ddacf8da8a4565cb2b8e9a -rce64b7e15824641a6a6465c28eec5d8ec593f110
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 2cc90affe213bf8485ddacf8da8a4565cb2b8e9a)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
@@ -719,6 +719,7 @@
 
     if ( priorSubState != currentDialysisState )
     {
+        setCurrentSubState( (U32)currentDialysisState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentDialysisState );
     }
     // Publish saline bolus data at set interval (whether we are delivering one or not)
@@ -791,6 +792,7 @@
 
     if ( priorSubState != currentUFState )
     {
+        setCurrentSubState( (U32)currentUFState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentUFState );
     }
 
@@ -837,6 +839,7 @@
 
     if ( priorSubState != currentSalineBolusState )
     {
+        setCurrentSubState( (U32)currentSalineBolusState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentSalineBolusState );
     }