Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -rfb1673d2282822995ed233f3e9ea5dfb0567780d -r611ac03266421f8c4b7a03b4c1576838216aedb5
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision fb1673d2282822995ed233f3e9ea5dfb0567780d)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 611ac03266421f8c4b7a03b4c1576838216aedb5)
@@ -551,7 +551,8 @@
 
         if ( FALSE == hasCmdSqncFailed )
         {
-            state = BLOOD_LEAK_NORMAL_STATE;
+            bloodLeakSelfTestStatus = SELF_TEST_STATUS_PASSED;
+            state                   = BLOOD_LEAK_NORMAL_STATE;
         }
         else if ( bloodLeakEmbModeCmd[ Z_EMB_MODE_CMD ].commandRetryCount < BLOOD_LEAK_EMB_MODE_MAX_NUM_CMD_TRIES )
         {
@@ -564,6 +565,9 @@
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
             {
+                bloodLeakSelfTestStatus = SELF_TEST_STATUS_FAILED;
+                state                   = BLOOD_LEAK_INIT_STATE;
+
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED, failedCmd );
             }
         }