diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/utils/PumpUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/utils/PumpUtil.java
index 48a24a0222..4e8076751b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/utils/PumpUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/utils/PumpUtil.java
@@ -58,8 +58,8 @@ public class PumpUtil {
             basalStepSize = specialBolusSize.getStepSizeForAmount(basalAmount.floatValue());
         }
 
-        if (basalAmount> pumpType.getBaseBasalMaxValue())
-            basalAmount = pumpType.getBaseBasalMaxValue().doubleValue();
+        if (basalAmount> pumpType.getTbrSettings().getMaxDose())
+            basalAmount = pumpType.getTbrSettings().getMaxDose().doubleValue();
 
 
         return Math.round(basalAmount/basalStepSize) * basalStepSize;