Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r346e74cbf78fdf1ea7cd779103476e49c4ee190e -r62eb3754c436035f416aaa82c6ccf3eb12207112
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 346e74cbf78fdf1ea7cd779103476e49c4ee190e)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 62eb3754c436035f416aaa82c6ccf3eb12207112)
@@ -7,8 +7,8 @@
 *
 * @file    Rinseback.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      17-Jul-2023
+* @author  (last)      James Walter Taylor
+* @date    (last)      16-Aug-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  20-Jan-2021
@@ -459,8 +459,9 @@
  * @brief
  * The handleRinsebackPausedState function handles the rinseback paused
  * state operations.
- * @details Inputs: flags
- * @details Outputs: flags handled
+ * @details Inputs: rinsebackTimerCtr, resumeRinsebackRequested,
+ * endTreatmentRequested, endRinsebackRequested, rinsebackRate_mL_min
+ * @details Outputs: targetRinsebackVolumePlusAdditional_mL
  * @return next rinseback state
  *************************************************************************/
 static RINSEBACK_STATE_T handleRinsebackPausedState( void )
@@ -863,15 +864,8 @@
 
     if ( RINSEBACK_PAUSED_STATE == rinsebackState )
     {
-        if ( getNoRetriggerFlag() != TRUE )
-        {
-            result = TRUE;
-            resumeRinsebackRequested = TRUE;
-        }
-        else
-        {
-            *rejReason = REQUEST_REJECT_REASON_TREATMENT_CANNOT_BE_RESUMED;
-        }
+        result = TRUE;
+        resumeRinsebackRequested = TRUE;
     }
     else if ( RINSEBACK_RECONNECT_PATIENT_STATE == rinsebackState )
     {
@@ -1050,19 +1044,26 @@
         data.targetRinsebackVolumeMl = rinsebackTargetVolume_mL;
         rinsebackPublishTimerCtr = 0;
         // If we have completed rinseback, timeout is no longer in force - indicate by zeroing timeout.  Also include any additionals to target.
+        data.timeout = 0;
+        data.countdown = 0;
         if ( ( rinsebackState > RINSEBACK_PAUSED_STATE ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
         {
             data.targetRinsebackVolumeMl = targetRinsebackVolumePlusAdditional_mL;
-            timeout = 0;
         }
         data.deliveredRinsebackVolumeMl = getRinsebackVolume();
         data.rinsebackFlowRateMlMin = rinsebackRate_mL_min;
         if ( RINSEBACK_RUN_ADDITIONAL_STATE == rinsebackState )
         {
             data.rinsebackFlowRateMlMin = DEFAULT_RINSEBACK_FLOW_RATE_ML_MIN;
         }
-        data.timeout = timeout;
-        data.countdown = countdown;
+        if ( getRinsebackCompleted() != TRUE )
+        {
+            if ( rinsebackTimerCtr > 0 )                                  // Timer set to zero when BP is running
+            {
+                data.timeout = timeout;
+                data.countdown = countdown;
+            }
+        }
         if ( data.deliveredRinsebackVolumeMl >= rinsebackTargetVolume_mL )
         {
             data.isCompleted = TRUE;