Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r667feab319b14681a0330a715da7a1ba930b518d -r29a2c3c7d7618489c0ada9f98e1d30226b455392
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 29a2c3c7d7618489c0ada9f98e1d30226b455392)
@@ -182,9 +182,11 @@
     if ( ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) &&
          ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) )
     {
-        if ( ++airTrapIllegalLevelSensorsCtr >= AIR_TRAP_ILLEGAL_LEVELS_PERSISTENCE )
+        if ( ( ++airTrapIllegalLevelSensorsCtr >= AIR_TRAP_ILLEGAL_LEVELS_PERSISTENCE ) &&
+             ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ILLEGAL_AIR_TRAP_ALARM ) ) != SW_CONFIG_ENABLE_VALUE )
         {
 #ifndef DISABLE_ILLEGAL_AIR_TRAP_ALARM
+
             activateAlarmNoData( ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS );
 #endif
         }