Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r2c9bbece8057254f8389c26a818081002fb69a77 -ra990118f3679c55206a9b6ba231aab6631c1ad8b
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 2c9bbece8057254f8389c26a818081002fb69a77)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision a990118f3679c55206a9b6ba231aab6631c1ad8b)
@@ -362,19 +362,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
         }
     }
 
@@ -393,7 +395,7 @@
 {
     BLOOD_LEAK_STATES_T state = BLOOD_LEAK_SELF_TEST_STATE;
 
-#ifndef IGNORE_BLOOD_LEAK_ALARM
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
     if ( SELF_TEST_STATUS_IN_PROGRESS == bloodLeakSelfTestStatus )
     {
         if ( FALSE == noFPGABloodLeakDetected() ) // Faked blood leak caused by independent MCU board