Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r32763ee524dc476f47ba41ee6c2a8a0c65ebf1e1 -r20f69d01f2a252eeef3d936dc0983491eb2e7a3d
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 32763ee524dc476f47ba41ee6c2a8a0c65ebf1e1)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 20f69d01f2a252eeef3d936dc0983491eb2e7a3d)
@@ -7,8 +7,8 @@
 *
 * @file    AirTrap.c
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      02-Mar-2026
+* @author  (last)      Praneeth Bunne
+* @date    (last)      13-Mar-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  24-Oct-2024
@@ -26,6 +26,7 @@
 #include "Pressures.h"
 #include "Switches.h"
 #include "TaskGeneral.h"
+#include "TestSupport.h"
 #include "Timers.h"
 #include "Utilities.h"
 #include "Valve3Way.h"
@@ -399,7 +400,11 @@
         pendingStopAirTrapController = FALSE;
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
     }
-
+    // Skip fill and lower level events when no tubing set is installed
+    else if ( TRUE == getTestConfigStatus( TEST_CONFIG_TESTING_WITHOUT_TUBING_SET ) )
+    {
+        result = AIR_TRAP_CLOSED_STATE;
+    }
     // Lower air trap level if fluid reaches upper level.
     else if ( AIR_TRAP_LEVEL_FLUID == getLevelSensorState( H16_LEVL ) )
     {
@@ -427,7 +432,6 @@
             result = AIR_TRAP_LOWER_LEVEL_STATE;
         }
     }
-
     // Raise air trap level once at start of treatment (blood priming) or when air detected at lower level
     else if ( ( airTrapWasFilledAtStartOfTreatement != TRUE ) ||
               ( AIR_TRAP_LEVEL_AIR == getLevelSensorState( H17_LEVL ) ) )