Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r16a2bacb1350a9649c90e7e9418a2003e0a9d5ad -ree1d1669c5438e67f1ef6bae3d8591373754f289
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 16a2bacb1350a9649c90e7e9418a2003e0a9d5ad)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision ee1d1669c5438e67f1ef6bae3d8591373754f289)
@@ -7,8 +7,8 @@
 *
 * @file    Prime.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      10-Jul-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      12-Jul-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  08-Dec-2020
@@ -432,15 +432,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;
     }