Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -r7d0fd5ed6b9db0479af90477e5108f6d3fa8df17
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 7d0fd5ed6b9db0479af90477e5108f6d3fa8df17)
@@ -1,23 +1,25 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 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)      21-Sep-2022
+* @date    (last)      11-Apr-2024
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
-#include "OperationModes.h"
-#include "ModeService.h"
+#include "ConcentratePumps.h"
 #include "CPLD.h"
+#include "LoadCell.h"
+#include "ModeService.h"
+#include "OperationModes.h"
 
 /**
  *  @addtogroup DGServiceMode
@@ -55,8 +57,13 @@
 {
     // Deenergize all the actuators
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
-    deenergizeActuators();
+    deenergizeActuators( NO_PARK_CONC_PUMPS );
     initServiceMode();
+    setCurrentSubState( NO_SUB_STATE );
+    resetLoadCellOffset( LOAD_CELL_RESERVOIR_1_PRIMARY );
+    resetLoadCellOffset( LOAD_CELL_RESERVOIR_1_BACKUP );
+    resetLoadCellOffset( LOAD_CELL_RESERVOIR_2_PRIMARY );
+    resetLoadCellOffset( LOAD_CELL_RESERVOIR_2_BACKUP );
 
     return serviceState;
 }