Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r1bff8e530735be63ba557b77557a0bc2ac4b37b2 -rce64b7e15824641a6a6465c28eec5d8ec593f110
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1bff8e530735be63ba557b77557a0bc2ac4b37b2)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
@@ -371,6 +371,7 @@
 
     if ( priorSubState != currentNoCartSelfTestsState )
     {
+        setCurrentSubState( (U32)currentNoCartSelfTestsState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentNoCartSelfTestsState );
     }
     // Publish current self-test time data
@@ -532,6 +533,7 @@
 
     if ( priorSubState != currentDrySelfTestsState )
     {
+        setCurrentSubState( (U32)currentDrySelfTestsState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentDrySelfTestsState );
     }
     // Publish current self-test time data
@@ -679,6 +681,7 @@
 
     if ( priorSubState != currentWetSelfTestsState )
     {
+        setCurrentSubState( (U32)currentWetSelfTestsState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentWetSelfTestsState );
     }
 }