Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -ra50b999266616eb3d0661846cd31bb395c8a7e12 -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision a50b999266616eb3d0661846cd31bb395c8a7e12)
+++ 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)      Sean Nash
-* @date    (last)      29-Jan-2023
+* @author  (last)      Dara Navaei
+* @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 );