Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -rc1e2dfcd544f59788ad1a58e1e8339a475ba4266 -r6a3548084b4c7268dcee35009ab2b0fd6beb9c08
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision c1e2dfcd544f59788ad1a58e1e8339a475ba4266)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 6a3548084b4c7268dcee35009ab2b0fd6beb9c08)
@@ -61,7 +61,8 @@
 #define LOAD_CELL_STEADY_VOLUME_SAMPLING_TIME               (  1 * MS_PER_SECOND )                             ///< Time load cell reading steady state detection sampling time in seconds.
 #define PRIME_DIALYSATE_BYPASS_TIME_LIMIT                   ( 8 * MS_PER_SECOND )                              ///< Time limit for priming dialysate bypass circuit.
 #define STEADY_VOLUME_COUNT_SEC                             ( 10000 / LOAD_CELL_STEADY_VOLUME_SAMPLING_TIME )  ///< Counter must be greater than 10 seconds before steady volume is true.
-#define STEADY_VOLUME_TIME_DEADLINE_MS                      ( 55 * MS_PER_SECOND )                             ///< Time in msec for the steady volume deadline time out.
+#define STEADY_VOLUME_DIALYSATE_PRIME_TIME_LIMIT_MS         ( 55 * MS_PER_SECOND )                             ///< Time in msec for the reservoir volume to stabilize during dialysate prime state.
+#define STEADY_VOLUME_BYPASS_PRIME_TIME_LIMIT_MS            ( 25 * MS_PER_SECOND )                             ///< Time in msec for the reservoir volume to stabilize during bypass dialysate prime state.
 
 #define VENOUS_PRESSURE_BUBBLE_CLEAR_MAX_MMHG               ( 200.0F )                                         ///< Maximum venous pressure reading (in mmHg) for bubble clear.
 #define BUBBLE_CLEAR_WAIT_TIME_INITIAL_MS                   ( 10 * MS_PER_SECOND )                             ///< Time in msec to wait for initial bubble clear pressure.
@@ -774,7 +775,7 @@
         steadyVolumeSamplingStartTime = getMSTimerCount();
     }
 
-    if ( TRUE == didTimeout( primeDialysateDialyzerStartTime, primeDialysateDialyzerTimeLimit + STEADY_VOLUME_TIME_DEADLINE_MS ) )
+    if ( TRUE == didTimeout( primeDialysateDialyzerStartTime, primeDialysateDialyzerTimeLimit + STEADY_VOLUME_DIALYSATE_PRIME_TIME_LIMIT_MS ) )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PRIME_DIALYSATE_DIALYZER_TIME_OUT, primeDialysateDialyzerTimeLimit );
     }
@@ -938,7 +939,7 @@
         steadyVolumeSamplingStartTime = getMSTimerCount();
     }
 
-    if ( TRUE == didTimeout( primeDialysateBypassStartTime, PRIME_DIALYSATE_BYPASS_TIME_LIMIT + STEADY_VOLUME_TIME_DEADLINE_MS ) )  // allocate 55 seconds for the steady state logic to do its job before timing out
+    if ( TRUE == didTimeout( primeDialysateBypassStartTime, PRIME_DIALYSATE_BYPASS_TIME_LIMIT + STEADY_VOLUME_BYPASS_PRIME_TIME_LIMIT_MS ) )  // allocate 25 seconds for the steady state logic to do its job before timing out
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PRIME_DIALYSATE_BYPASS_TIME_OUT, PRIME_DIALYSATE_BYPASS_TIME_LIMIT );
     }