diff --git a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
index 792844db..73fbe8c4 100644
--- a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
+++ b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
@@ -1098,6 +1098,19 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore
             return pcbId;
         }
         /// <summary>
+        /// Get empty pipe control bits MagFlux
+        /// </summary>
+        public Boolean GetEmptyPipeControl()
+        {
+            var retVal = RequestProtocol.GetEmptyPipeControl(out var epd_cntl_bits);
+            if (retVal)
+            {
+                EpdControlBits = epd_cntl_bits;
+            }
+
+            return retVal;
+        }
+        /// <summary>
         /// Write calibration values to MagFlux
         /// </summary>
         public void WriteCalibration(List<Calibration> calibrationsCmPerH)
diff --git a/Common/Ui/MagFluxToolBox/FrmTest.cs b/Common/Ui/MagFluxToolBox/FrmTest.cs
index a0f044aa..ac6b0bd4 100644
--- a/Common/Ui/MagFluxToolBox/FrmTest.cs
+++ b/Common/Ui/MagFluxToolBox/FrmTest.cs
@@ -636,7 +636,20 @@ namespace Xylem.Common.Ui.MagFluxToolBox
         private void cbxIgnoreEmptyPipeStatus_CheckedChanged(Object sender, EventArgs e)
         {
             var retVal = _magFluxMeter?.SetIgnoreFailOnEmptyPipeOnHealthy(cbxIgnoreEmptyPipeStatus.Checked);
-            cbxIgnoreEmptyPipeStatus.ForeColor = retVal == null || (Boolean) retVal == false ? Color.Red : SystemColors.ControlText;
+            if (retVal != null && (Boolean)retVal)
+            {
+                cbxIgnoreEmptyPipeStatus.ForeColor = SystemColors.ControlText;
+                if (_magFluxMeter != null && _magFluxMeter.GetEmptyPipeControl())
+                {
+                    cbxStatus10.Checked = (_magFluxMeter?.EpdControlBits & 0x01) == 0x01;
+                    cbxStatus11.Checked = (_magFluxMeter?.EpdControlBits & 0x02) == 0x02;
+                    cbxStatus12.Checked = (_magFluxMeter?.EpdControlBits & 0x04) == 0x04;
+                }
+            }
+            else
+            {
+                cbxIgnoreEmptyPipeStatus.ForeColor = Color.Red;
+            }
         }
 
         private void cbxSimulatedFlow_CheckedChanged(Object sender, EventArgs e)