Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf9521503c0e00e84b298983d954e8dd000d93c17 -r70fe39f8fad7b62acc0e0f9cc53881b49653dbbe
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f9521503c0e00e84b298983d954e8dd000d93c17)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 70fe39f8fad7b62acc0e0f9cc53881b49653dbbe)
@@ -382,21 +382,13 @@
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {
         U32 const elapsedSelfTestTimeInSecs = calcTimeSince( selfTestStartTime ) / MS_PER_SECOND;
+        SELF_TEST_NO_CARTRIDGE_PAYLOAD_T data;
 
         selfTestPreviousPublishDataTime = getMSTimerCount();
 
-        if ( elapsedSelfTestTimeInSecs <= MAX_NO_CARTRIDGE_SELF_TEST_TIME )
-        {
-            SELF_TEST_NO_CARTRIDGE_PAYLOAD_T data;
-
-            data.timeout   = MAX_NO_CARTRIDGE_SELF_TEST_TIME;
-            data.countdown = ( MAX_NO_CARTRIDGE_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
-            broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
-        }
-        else
-        {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
-        }
+        data.timeout   = MAX_NO_CARTRIDGE_SELF_TEST_TIME;
+        data.countdown = ( elapsedSelfTestTimeInSecs <= MAX_NO_CARTRIDGE_SELF_TEST_TIME ? MAX_NO_CARTRIDGE_SELF_TEST_TIME - elapsedSelfTestTimeInSecs : 0 );
+        broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
     }
 }