Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r7325348a8b5fce9101d0f68d89c791d48e1a3575 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 7325348a8b5fce9101d0f68d89c791d48e1a3575)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -270,14 +270,17 @@
  *************************************************************************/
 U32 execTreatmentMode( void )
 {
-#ifdef DISABLE_UI_TREATMENT_WORKFLOW
     BOOL stop = isStopButtonPressed();
 
     if ( TRUE == stop )
     {
+#ifndef DISABLE_UI_TREATMENT_WORKFLOW
+        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+#else
         requestNewOperationMode( MODE_POST );
-    }
 #endif
+    }
+
     // treatment mode state machine
     switch ( currentTreatmentState )
     {