Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r332ada1b3233f2cf143636755e44feb53544b3b0 -r9f1049a59d37ab7ddfc8f369922eed119bb9699c
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 332ada1b3233f2cf143636755e44feb53544b3b0)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 9f1049a59d37ab7ddfc8f369922eed119bb9699c)
@@ -517,13 +517,12 @@
     BLOOD_LEAK_STATE_T state = BLOOD_LEAK_CHECK_SET_POINT_STATE;
     U16 bloodLeakSetPoint    = bloodLeakEmbModeCmd[ D_EMB_MODE_CMD ].commandResp;
     BOOL isCommandRespReady  = bloodLeakEmbModeCmd[ D_EMB_MODE_CMD ].isCmdRespRdy;
+    U08 commandDRqstCount    = bloodLeakEmbModeCmd[ D_EMB_MODE_CMD ].commandRqstCount;
 
+    SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES, (U32)commandDRqstCount, state )
+
     if ( ( bloodLeakSetPoint != bloodLeakCalRecord.setPoint ) && ( TRUE == isCommandRespReady ) )
     {
-        U08 commandDRqstCount = bloodLeakEmbModeCmd[ D_EMB_MODE_CMD ].commandRqstCount;
-
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES, (U32)commandDRqstCount, state )
-
         if ( commandDRqstCount < BLOOD_LEAK_EMB_MODE_MAX_NUM_CMD_TRIES )
         {
             enqueueEmbModeCmd( D_EMB_MODE_CMD );