Index: firmware/App/Controllers/AirPump.c
===================================================================
diff -u -rc8738ed391f9dab772b8ced446ee595d8075186f -rb459546476339d45e8b39b3991dac20effeab415
--- firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision c8738ed391f9dab772b8ced446ee595d8075186f)
+++ firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision b459546476339d45e8b39b3991dac20effeab415)
@@ -16,6 +16,7 @@
 ***************************************************************************/
 
 #include "AirPump.h"
+#include "AirTrap.h"
 #include "AlarmMgmtTD.h"
 #include "GLXferPump.h"
 #include "Messaging.h"
@@ -249,6 +250,10 @@
        if ( ++airPumpStallCounter >= AIR_PUMP_STALL_PERSISTENCE )
        {
            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_AIR_PUMP_STALL, currentAirPumpPowerLevel, currentAirPumpRPM );
+           // Stop H12 air pump
+           setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
+           // Stop air trap control
+           endAirTrapControl();
        }
    }
    else
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r2b2e6b9f81b69e782c5ca99ef52771a85ead332e -rb459546476339d45e8b39b3991dac20effeab415
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 2b2e6b9f81b69e782c5ca99ef52771a85ead332e)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision b459546476339d45e8b39b3991dac20effeab415)
@@ -8,7 +8,7 @@
 * @file    Messaging.c
 *
 * @author  (last)      Raghu Kallala
-* @date    (last)      06-Apr-2026
+* @date    (last)      30-Apr-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024