Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -rd367cda979e9684a25b0d4d5df52bbcf4f3c0acf -r70fe39f8fad7b62acc0e0f9cc53881b49653dbbe
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision d367cda979e9684a25b0d4d5df52bbcf4f3c0acf)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 70fe39f8fad7b62acc0e0f9cc53881b49653dbbe)
@@ -431,15 +431,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;
     }