Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -r71765ffa0a251ca541fce096ee6008fc5a26a8a1 -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 71765ffa0a251ca541fce096ee6008fc5a26a8a1)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-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    ModeService.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      11-Jan-2023
+* @date    (last)      17-Oct-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -57,8 +57,11 @@
  *************************************************************************/
 U32 transitionToServiceMode( void )
 {
+    initServiceMode();
+
     doorClosedRequired( FALSE, FALSE );
     syringeDetectionRequired( FALSE );
+    setCurrentSubState( NO_SUB_STATE );
 
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
@@ -71,12 +74,8 @@
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
-#ifndef _RELEASE_
-    if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
-#endif
-    {
-        setAirPumpState( AIR_PUMP_STATE_OFF );
-    }
+    setAirPumpState( AIR_PUMP_STATE_OFF );
+
     setValveAirTrap( STATE_CLOSED );
     setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
     setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );