Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -rb531672fa7e70a0be9e4fa0e9c87bfe3c2628d68 -r55652a393b0aa2f9d9a45994f4f15628bdb2b8d1
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision b531672fa7e70a0be9e4fa0e9c87bfe3c2628d68)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 55652a393b0aa2f9d9a45994f4f15628bdb2b8d1)
@@ -310,19 +310,21 @@
 
     if ( TRUE == FPGABloodLeakZeroDetected() )
     {
-        state = BLOOD_LEAK_SELF_TEST_STATE;
         bloodLeakSelfTestStatus = SELF_TEST_STATUS_IN_PROGRESS;
         clearFPGABloodLeakZero();
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
         setFPGABloodLeakSelfTest();
+        state = BLOOD_LEAK_SELF_TEST_STATE;
+#else
+        state = BLOOD_LEAK_NORMAL_STATE;
+#endif
         bloodLeakSelfTestStartTime = getMSTimerCount();
     }
     else
     {
         if ( TRUE == didTimeout( bloodLeakZeroStartTime, BLOOD_LEAK_TIMEOUT_MS ) )
         {
-#ifndef IGNORE_BLOOD_LEAK_ALARM
             activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_FAULT );
-#endif
         }
     }