diff --git a/js/common/view/MaterialMassVolumeControlNode.ts b/js/common/view/MaterialMassVolumeControlNode.ts
index eb6c2957..b2b0800c 100644
--- a/js/common/view/MaterialMassVolumeControlNode.ts
+++ b/js/common/view/MaterialMassVolumeControlNode.ts
@@ -170,9 +170,11 @@ export default class MaterialMassVolumeControlNode extends MaterialControlNode {
       valueComparisonStrategy: 'equalsFunction'
     } );
 
+    const maxMass = Math.max( ...[ options.maxMass, options.maxCustomMass, options.highDensityMaxMass ].filter( x => typeof x === 'number' ) );
+
     // passed to the NumberControl
     const numberControlMassProperty = new GuardedNumberProperty( massProperty.value, {
-      range: new Range( options.minMass, options.highDensityMaxMass || options.maxMass ),
+      range: new Range( options.minMass, maxMass ),
       units: 'kg',
       tandem: massNumberControlContainerTandem.createTandem( 'massProperty' ),
       phetioFeatured: true,