Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r3c45b8930e1bbd1ff5757ec6d9e37e3d7a464fc3 -r51147222d369a3023a11b2ee675178d058ffaf46
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 3c45b8930e1bbd1ff5757ec6d9e37e3d7a464fc3)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 51147222d369a3023a11b2ee675178d058ffaf46)
@@ -302,6 +302,7 @@
         {
             lastOffButtonState = BUTTON_STATE_PRESSED;
             stopDialysis();
+            transitionToTreatmentStop();
             result = TREATMENT_STOP_STATE;
         }
     }
@@ -338,6 +339,7 @@
             lastOffButtonState = BUTTON_STATE_PRESSED;
             lastTreatmentTimeStamp = getMSTimerCount();
             startDialysis();
+            transitionToDialysis();
             result = TREATMENT_DIALYSIS_STATE;
         }
     }