Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r791b25bd20e80fce8c5d7e8a3ac37d8395f2315c -rbe75ea1f0884be254a32d8f8b61f71b0b7da77e9
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 791b25bd20e80fce8c5d7e8a3ac37d8395f2315c)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision be75ea1f0884be254a32d8f8b61f71b0b7da77e9)
@@ -553,7 +553,8 @@
     // Check if the zero command has been requested
     if ( TRUE == bloodLeakEmbModeHasZeroBeenRqustd )
     {
-        state = BLOOD_LEAK_CHECK_ZERO_AND_SELF_TEST_STATE;
+        bloodLeakEmbModeHasZeroBeenRqustd = FALSE;
+        state                             = BLOOD_LEAK_CHECK_ZERO_AND_SELF_TEST_STATE;
     }
 
     return state;
@@ -632,7 +633,6 @@
         {
             // Done with zero sequence, transition to other states
             bloodLeakEmbModeCmd[ Z_EMB_MODE_CMD ].commandRqstCount = 0;
-            bloodLeakEmbModeHasZeroBeenRqustd                      = FALSE;
             bloodLeakSelfTestStatus                                = SELF_TEST_STATUS_PASSED;
             state                                                  = BLOOD_LEAK_NORMAL_STATE;
         }
@@ -1058,10 +1058,10 @@
         bloodLeakEmbModeRqstedCmd = NU_EMB_MODE_CMD;
         state                     = BLOOD_LEAK_EMB_MODE_WAIT_FOR_COMAND_STATE;
 
-        if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BLOOD_LEAK_COMM_ERROR ) )
+        /*if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BLOOD_LEAK_COMM_ERROR ) )
         {
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_BLOOD_LEAK_FPGA_FAULT, MAX_BLOOD_LEAK_COMM_FAILURES, (U32)MAX_BLOOD_LEAK_COMM_FAILURES_WINDOW_MS )
-        }
+        }*/
     }
 
     return state;