Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rd39ef6232e746a4f2d425135208602670fae60bd -r8a0735916a4006faaf0651d685131916517c4f33
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision d39ef6232e746a4f2d425135208602670fae60bd)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 8a0735916a4006faaf0651d685131916517c4f33)
@@ -615,6 +615,7 @@
 void setDialysateFlowData( F32 flowRate )
 {
     dgDialysateFlowRateMlMin = flowRate;
+    filterDialInFlowReadings( flowRate * (F32)ML_PER_LITER );
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -re1b010909170d0656a7b87400f295387423fd383 -r8a0735916a4006faaf0651d685131916517c4f33
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision e1b010909170d0656a7b87400f295387423fd383)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 8a0735916a4006faaf0651d685131916517c4f33)
@@ -227,7 +227,6 @@
 static void setDialInPumpDirection( MOTOR_DIR_T dir );
 static void publishDialInFlowData( void );
 static void resetDialInFlowMovingAverage( void );
-static void filterDialInFlowReadings( F32 flow );
 static void updateDialInPumpSpeedAndDirectionFromHallSensors( void );
 static void checkDialInPumpRotor( void );
 static void checkDialInPumpDirection( void );
@@ -487,15 +486,12 @@
     lastDialysateFlowSlowPacketReadCtr = spReadCtr;
 
     dialInFlowSignalStrength.data = getFPGADialysateFlowSignalStrength();
-#else
-    dipFlow = getDGDialysateFlowRateMlMin() * (F32)ML_PER_LITER;  // get dialysate flow from DG
+    filterDialInFlowReadings( dipFlow );
 #endif
 
     adcDialInPumpMCSpeedRPM.data = (F32)(SIGN_FROM_12_BIT_VALUE(dipRPM)) * DIP_SPEED_ADC_TO_RPM_FACTOR;
     adcDialInPumpMCCurrentmA.data = (F32)(SIGN_FROM_12_BIT_VALUE(dipmA)) * DIP_CURRENT_ADC_TO_MA_FACTOR;
 
-    filterDialInFlowReadings( dipFlow );
-
     // Calculate dialysate inlet pump motor speed/direction from hall sensor count
     updateDialInPumpSpeedAndDirectionFromHallSensors();
 
@@ -1022,7 +1018,7 @@
  * @details Outputs: flowReadings[], flowReadingsIdx, flowReadingsCount, flowReadingsTotal
  * @return none
  *************************************************************************/
-static void filterDialInFlowReadings( F32 flow )
+void filterDialInFlowReadings( F32 flow )
 {
     if ( flowReadingsCount >= SIZE_OF_ROLLING_AVG )
     {
Index: firmware/App/Controllers/DialInFlow.h
===================================================================
diff -u -r5070f8552a200e15dcc2ca0532db10fba9dc8c6b -r8a0735916a4006faaf0651d685131916517c4f33
--- firmware/App/Controllers/DialInFlow.h	(.../DialInFlow.h)	(revision 5070f8552a200e15dcc2ca0532db10fba9dc8c6b)
+++ firmware/App/Controllers/DialInFlow.h	(.../DialInFlow.h)	(revision 8a0735916a4006faaf0651d685131916517c4f33)
@@ -57,6 +57,7 @@
 BOOL setDialInPumpTargetFlowRate( U32 flowRate, MOTOR_DIR_T dir, PUMP_CONTROL_MODE_T mode );
 void signalDialInPumpHardStop( void );
 void signalDialInPumpRotorHallSensor( void );
+void filterDialInFlowReadings( F32 flow );
 BOOL homeDialInPump( void );
 BOOL isDialInPumpRunning( void );
 
Index: firmware/App/HDCommon.h
===================================================================
diff -u -re1b010909170d0656a7b87400f295387423fd383 -r8a0735916a4006faaf0651d685131916517c4f33
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision e1b010909170d0656a7b87400f295387423fd383)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 8a0735916a4006faaf0651d685131916517c4f33)
@@ -74,7 +74,7 @@
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute
     #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
 //    #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps
-    #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
+//    #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
     #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
     // Skip Pre-Treatment and get to treatment as soon as possible