Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1)
+++ 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 );
-    setCurrentSubState( NO_SUB_STATE );
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );