Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -r37a9fd8f15e413db5337371a7d1a1cb65567af7c -rba4b62be88b1a12ff5cd9cc68624302fe4f608a4
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 37a9fd8f15e413db5337371a7d1a1cb65567af7c)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision ba4b62be88b1a12ff5cd9cc68624302fe4f608a4)
@@ -210,17 +210,11 @@
                         case TREATMENT_BLOOD_PRIME_STATE:
                         case TREATMENT_DIALYSIS_STATE:
                         case TREATMENT_END_STATE:
-                            if ( bubble == ADV )
-                            {
-                                activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
-                            }
+                            activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
                             break;
 
                         case TREATMENT_RINSEBACK_STATE:
-                            if ( bubble == ADV )
-                            {
-                                activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
-                            }
+                            activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
                             break;
 
                         default:
@@ -231,11 +225,8 @@
             }
             else // Air bubble not detected
             {
-                if ( bubble == ADV )
-                {
-                    clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
-                    clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
-                }
+                clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
+                clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
             }
         }