Index: firmware/App/Modes/ModeROPermeateSample.c
===================================================================
diff -u -r81be0186c4a6ab75247cf5e2c498f1059b37bca9 -rb60a41d0ef4ca2d04287adc357c4cdde2b7cb613
--- firmware/App/Modes/ModeROPermeateSample.c	(.../ModeROPermeateSample.c)	(revision 81be0186c4a6ab75247cf5e2c498f1059b37bca9)
+++ firmware/App/Modes/ModeROPermeateSample.c	(.../ModeROPermeateSample.c)	(revision b60a41d0ef4ca2d04287adc357c4cdde2b7cb613)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2023-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2023-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeROPermeateSample.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      13-Jun-2023
+* @date    (last)      27-Jul-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  24-May-2023
@@ -620,13 +620,16 @@
  *************************************************************************/
 static void failROPermeateSample( void )
 {
+    // If a fault alarm is active go to mode fault otherwise for cleaning mode alarms, transition to standby
+    DG_OP_MODE_T nextOpMode = ( FALSE == isDGFaultAlarmActive() ? DG_MODE_STAN : DG_MODE_FAUL );
+
     // In the cleaning modes the alarms are triggered but the mode is not transitioned to fault automatically
     // so transition to fault mode is done here
     if ( alarmDetectedPendingTrigger != ALARM_ID_NO_ALARM )
     {
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, roPermeateSamplePrevState )
     }
-    requestNewOperationMode( DG_MODE_STAN );
+    requestNewOperationMode( nextOpMode );
 }
 
 /*********************************************************************//**