Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -reb64545b0bddac878e5d930272c6c8068bb4089a -r158c9ecf7ed2404a53b387bfc3f9202a25d7c0ee
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision eb64545b0bddac878e5d930272c6c8068bb4089a)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 158c9ecf7ed2404a53b387bfc3f9202a25d7c0ee)
@@ -245,25 +245,29 @@
         // Check status reading and act upon
         if ( BUBBLE_DETECTED == getBubbleStatus( bubble ) )
         {
-            if ( getCurrentOperationMode() == MODE_TREA )
+            if ( ( getCurrentOperationMode() == MODE_TREA ) && ( getTreatmentState() != TREATMENT_RINSEBACK_STATE ) )
             {
-                if ( bubble == ADA )
+                // TODO: Enable if ADA is ever used to detect air bubble on arterial line during treatment
+                //if ( bubble == ADA )
+                //{
+                //    activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED );
+                //}
+
+                if ( bubble == ADV )
                 {
-                    activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED );
-                }
-                else if ( bubble == ADV )
-                {
                     activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
                 }
             }
-            else if ( getCurrentOperationMode() == TREATMENT_RINSEBACK_STATE ) // TODO: Any better mode to know we are in rinseback?
+            else if ( ( getCurrentOperationMode() == MODE_TREA ) && ( getTreatmentState() == TREATMENT_RINSEBACK_STATE ) )
             {
-                if ( bubble == ADA )
+                // TODO: Enable if ADA is ever used to detect air bubble on arterial line during rinseback
+                //if ( bubble == ADA )
+                //{
+                //    activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTOR_FAULT );
+                //}
+
+                if ( bubble == ADV )
                 {
-                    activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTOR_FAULT );
-                }
-                else if ( bubble == ADV )
-                {
                     activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT );
                 }
             }
@@ -274,7 +278,8 @@
             {
                 clearAlarmCondition( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED );
             }
-            else if ( bubble == ADV )
+
+            if ( bubble == ADV )
             {
                 clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
             }