Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rb85105e030511230c888caff5db8efff0b3c4f42 -r819f07cd55062f2910aea55aade423bb7456e153
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision b85105e030511230c888caff5db8efff0b3c4f42)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 819f07cd55062f2910aea55aade423bb7456e153)
@@ -46,7 +46,7 @@
 #define AIR_TRAP_LEVEL_DEBOUNCE_TIME_MS     ( 400 )                                             ///< Air trap level sensor debounce time
 // Persistence period for illegal level sensors fault.
 #define AIR_TRAP_ILLEGAL_LEVELS_TIMEOUT_MS  ( 2 * MS_PER_SECOND )                               ///< Air trap illegal values timeout (in ms)
-#define AIR_TRAP_UPPER_LEVEL_FLUID_TIMEOUT_MS ( 60 * MS_PER_SECOND )                            ///< Air trap upper level fluid timeout in milliseconds.
+#define AIR_TRAP_UPPER_LEVEL_FLUID_TIMEOUT_MS ( 30 * MS_PER_SECOND )                            ///< Air trap upper level fluid timeout in milliseconds.
 
 /// Volume (in mL) of venous portion of blood circuit line.  TODO - get actual volume from Systems.
 #define VENOUS_LINE_VOLUME_ML               ( 200.0F )