Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r6f5bb3935a079cf48c836b2227db430c069bac40 -r204a2a20b60ec122fa97a71e24af8019d847ddce
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 6f5bb3935a079cf48c836b2227db430c069bac40)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 204a2a20b60ec122fa97a71e24af8019d847ddce)
@@ -436,15 +436,20 @@
  *************************************************************************/
 static void broadcastPrimingStatus( void )
 {
-    U32 const elapsedPrimeTimeInSecs = calcTimeSince( primeStartTime ) / MS_PER_SECOND;
+    U32 elapsedPrimeTimeInSecs = calcTimeSince( primeStartTime ) / MS_PER_SECOND;
 
+    // If the elapsed time is greater than the maximum prime time, it is capped to max prime time so the remaining time
+    // is a large number
+    elapsedPrimeTimeInSecs = CAP( elapsedPrimeTimeInSecs, MAX_PRIME_TIME );
+
     // timeout alarm that used to trigger when max prime time elapsed was removed.
     if ( ++primeStatusBroadcastTimerCounter >= PRIME_DATA_PUB_INTERVAL )
     {
         PRIMING_DATA_PAYLOAD_T primeData;
-        primeData.totalTime         = MAX_PRIME_TIME;
-        primeData.remainingTime     = MAX_PRIME_TIME - elapsedPrimeTimeInSecs;
 
+        primeData.totalTime     = MAX_PRIME_TIME;
+        primeData.remainingTime = MAX_PRIME_TIME - elapsedPrimeTimeInSecs;
+
         broadcastData( MSG_ID_HD_PRIMING_STATUS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&primeData, sizeof( PRIMING_DATA_PAYLOAD_T ) );
         primeStatusBroadcastTimerCounter = 0;
     }
@@ -1025,8 +1030,6 @@
     else if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         setupForPrimePause();
-        state = HD_PRIME_PAUSE;
-        setCurrent4thLevelState( NO_SUB_STATE );
     }
 
     return state;