Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r730d2eb07acfdf049f6beab646a327d67efbe2ba -rce64b7e15824641a6a6465c28eec5d8ec593f110
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 730d2eb07acfdf049f6beab646a327d67efbe2ba)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
@@ -282,6 +282,8 @@
     HD_TREATMENT_PARAMS_MODE_STATE_T priorSubState = currentTreatmentParamsState;
     BOOL stop = isStopButtonPressed();
 
+    setCurrentSubState( NO_SUB_STATE );
+
     if ( TRUE == stop )
     {
         // Ignore stop button in this mode.
@@ -304,11 +306,6 @@
 
     }
 
-    if ( priorSubState != currentTreatmentParamsState )
-    {
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentTreatmentParamsState );
-    }
-
     return (U32)currentTreatmentParamsState;
 }