Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -rcb3489cbebb9400abdfd1046ad0a6a045e3067e3 -r80b41ef317abec16b133aa4145d994a5b95f4df6
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision cb3489cbebb9400abdfd1046ad0a6a045e3067e3)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 80b41ef317abec16b133aa4145d994a5b95f4df6)
@@ -377,11 +377,11 @@
         {
             case DRAIN_PUMP_OFF_STATE:
             {
-                BOOL isRPMTooHigh    = FALSE;
-                isOffCurrentOut      = ( currentA > DRAIN_PUMP_MAX_CURRENT_WHEN_OFF_A ? TRUE : FALSE );
+                BOOL isRPMTooHigh = FALSE;
 
-                isRPMTooHigh |= ( getDrainPumpMeasuredRPM( DRAIN_PUMP_HALL_SNSR_FB ) > MIN_DRAIN_PUMP_RPM ? TRUE : FALSE );
-                isRPMTooHigh |= ( getDrainPumpMeasuredRPM( DRAIN_PUMP_MAXON_SNSR_FB ) > MIN_DRAIN_PUMP_RPM ? TRUE : FALSE );
+                isOffCurrentOut = ( currentA > DRAIN_PUMP_MAX_CURRENT_WHEN_OFF_A ? TRUE : FALSE );
+                isRPMTooHigh   |= ( getDrainPumpMeasuredRPM( DRAIN_PUMP_HALL_SNSR_FB ) > MIN_DRAIN_PUMP_RPM ? TRUE : FALSE );
+                isRPMTooHigh   |= ( getDrainPumpMeasuredRPM( DRAIN_PUMP_MAXON_SNSR_FB ) > MIN_DRAIN_PUMP_RPM ? TRUE : FALSE );
 
                 checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_RPM_OUT_OF_RANGE, FALSE, getDrainPumpMeasuredRPM( DRAIN_PUMP_MAXON_SNSR_FB ), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
                 checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_OFF_FAULT, isRPMTooHigh, getDrainPumpMeasuredRPM( DRAIN_PUMP_MAXON_SNSR_FB ), MIN_DRAIN_PUMP_RPM );