Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r19e1a496b98f0205b20cd443f8f4d363e7af7f1a -r5beae1a840a50cda2f18eb84a8f51710259a5cb3
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 19e1a496b98f0205b20cd443f8f4d363e7af7f1a)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 5beae1a840a50cda2f18eb84a8f51710259a5cb3)
@@ -182,8 +182,8 @@
     signalDialOutPumpHardStop();
     stopSyringePump();
 
-    resetSignalFlags();
-    resetAlarmSignalFlags();
+    resetBloodPumpRotorCount();
+    resetDialInPumpRotorCount();
 
     // Set valves to default positions
     setValveAirTrap( STATE_CLOSED );
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r19e1a496b98f0205b20cd443f8f4d363e7af7f1a -r5beae1a840a50cda2f18eb84a8f51710259a5cb3
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 19e1a496b98f0205b20cd443f8f4d363e7af7f1a)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 5beae1a840a50cda2f18eb84a8f51710259a5cb3)
@@ -141,6 +141,8 @@
 static TREATMENT_STATE_T handleTreatmentRinsebackState( void );
 static TREATMENT_STATE_T handleTreatmentRecircState( void );
 static TREATMENT_STATE_T handleTreatmentEndState( void );
+static void resetSignalFlags( void );
+static void resetAlarmSignalFlags( void );
 
 /*********************************************************************//**
  * @brief
@@ -157,9 +159,6 @@
     treatmentCompleted = FALSE;
     rinsebackDone = FALSE;
 
-    resetBloodPumpRotorCount();
-    resetDialInPumpRotorCount();
-
     treatmentTimeMS = 0;
     lastTreatmentTimeStamp = 0;
     treatmentTimeBroadcastTimerCtr = TREATMENT_TIME_DATA_PUB_INTERVAL;                // So we send time data immediately when we begin treatment mode
@@ -170,6 +169,9 @@
     presMaxUFVolumeML = 0.0;
     presUFRate = 0.0;
 
+    resetSignalFlags();
+    resetAlarmSignalFlags();
+
     pendingParamChangesTimer = 0;
     pendingUFVolumeChange = 0.0;
     pendingUFRateChange = 0.0;
Index: firmware/App/Modes/ModeTreatment.h
===================================================================
diff -u -r19e1a496b98f0205b20cd443f8f4d363e7af7f1a -r5beae1a840a50cda2f18eb84a8f51710259a5cb3
--- firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 19e1a496b98f0205b20cd443f8f4d363e7af7f1a)
+++ firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 5beae1a840a50cda2f18eb84a8f51710259a5cb3)
@@ -137,9 +137,6 @@
 BOOL verifyBloodAndDialysateRateSettingsChange( U32 bloodRate, U32 dialRate );
 BOOL verifyPressureLimitsChange( PRESSURE_LIMIT_CHANGE_REQUEST_T *data );
 
-void resetSignalFlags( void );
-void resetAlarmSignalFlags( void );
-
 BOOL testSetTreatmentTimeRemainingOverride( U32 value );
 BOOL testSetTreatmentTimePublishIntervalOverride( U32 ms );
 BOOL testResetTreatmentTimePublishIntervalOverride( void );