Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r88a6a776015d6aee3a403a785bf9bbbec26028a8 -r47af9ee07565cde6b0ac062eacd7e40bc1be8d9f
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 88a6a776015d6aee3a403a785bf9bbbec26028a8)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 47af9ee07565cde6b0ac062eacd7e40bc1be8d9f)
@@ -881,10 +881,12 @@
         state                        = BLOOD_LEAK_INIT_STATE;
         bloodLeakExitNormalRequested = FALSE;
     }
+    else if ( TRUE == hasZeroBloodLeakBeenRequested() )
+    {
+        // Check whether zeroing the sensor has been requested or not if yes, transition to zero command state otherwise, stay in this state
+        state = BLOOD_LEAK_PREP_FOR_ZERO_CMD_STATE;
+    }
 
-    // Check whether zeroing the sensor has been requested or not if yes, transition to zero command state otherwise, stay in this state
-    state = ( TRUE == hasZeroBloodLeakBeenRequested() ? BLOOD_LEAK_PREP_FOR_ZERO_CMD_STATE : state );
-
     return state;
 }