Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r730d2eb07acfdf049f6beab646a327d67efbe2ba -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 730d2eb07acfdf049f6beab646a327d67efbe2ba)
+++ 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 );
-
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
@@ -306,7 +305,7 @@
 
     if ( priorSubState != currentTreatmentParamsState )
     {
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentTreatmentParamsState );
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_MODE_CHANGE, priorSubState, currentTreatmentParamsState );
     }
 
     return (U32)currentTreatmentParamsState;