Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215)
@@ -623,6 +623,8 @@
  *************************************************************************/
 void execDialysis( void )
 {
+    DIALYSIS_STATE_T priorSubState = currentDialysisState;
+
     // Check ultrafiltration max rate and accuracy during dialysis (even when ultrafiltration is paused).
     checkUFAccuracyAndVolume();
 
@@ -646,6 +648,10 @@
             break;
     }
 
+    if ( priorSubState != 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)
     publishSalineBolusData();
 }
@@ -661,6 +667,7 @@
 static DIALYSIS_STATE_T handleDialysisUltrafiltrationState( void )
 {
     DIALYSIS_STATE_T result = DIALYSIS_UF_STATE;
+    UF_STATE_T priorSubState = currentUFState;
     U32 preStop = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME );
     F32 minRem  = (F32)getTreatmentTimeRemainingSecs() / (F32)SEC_PER_MIN;
 
@@ -697,6 +704,11 @@
             break;
     }
 
+    if ( priorSubState != currentUFState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentUFState );
+    }
+
     return result;
 }
 
@@ -712,6 +724,8 @@
 {
     DIALYSIS_STATE_T result = DIALYSIS_SALINE_BOLUS_STATE;
 
+    SALINE_BOLUS_STATE_T priorSubState = currentSalineBolusState;
+
     switch ( currentSalineBolusState )
     {
         case SALINE_BOLUS_STATE_IDLE:
@@ -736,6 +750,11 @@
             break;
     }
 
+    if ( priorSubState != currentSalineBolusState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentSalineBolusState );
+    }
+
     return result;
 }