diff --git a/src/app/components/InternalSlot.jsx b/src/app/components/InternalSlot.jsx
index e5771787..9266c430 100644
--- a/src/app/components/InternalSlot.jsx
+++ b/src/app/components/InternalSlot.jsx
@@ -24,10 +24,11 @@ export default class InternalSlot extends Slot {
       let { termtip, tooltip } = this.context;
       let validMods = Modifications.validity[m.grp] || [];
 
+      let mass = m.getMass() || m.cargo || m.fuel || 0;
       return <div className='details' draggable='true' onDragStart={drag} onDragEnd={drop}>
         <div className={'cb'}>
           <div className={'l'}>{classRating} {translate(m.name || m.grp)}</div>
-          <div className={'r'}>{formats.round1(m.getMass()) || m.cargo || m.fuel || 0}{u.T}</div>
+          <div className={'r'}>{formats.round1(mass)}{u.T}</div>
         </div>
         <div className={'cb'}>
           { m.getOptMass() ? <div className={'l'}>{translate('optimal mass')}: {formats.int(m.getOptMass())}{u.T}</div> : null }
diff --git a/src/app/components/StandardSlot.jsx b/src/app/components/StandardSlot.jsx
index 98771aca..154a9b19 100644
--- a/src/app/components/StandardSlot.jsx
+++ b/src/app/components/StandardSlot.jsx
@@ -46,6 +46,7 @@ export default class StandardSlot extends TranslatedComponent {
     let classRating = m.class + m.rating;
     let menu;
     let validMods = m == null ? [] : (Modifications.validity[m.grp] || []);
+    let mass = m.getMass() || m.cargo || m.fuel || 0;
 
     if (!selected) {
       // If not selected then sure that modifications flag is unset
@@ -79,7 +80,7 @@ export default class StandardSlot extends TranslatedComponent {
           <div className={'sz'}>{slot.maxClass}</div>
           <div>
             <div className='l'>{classRating} {translate(m.grp == 'bh' ? m.grp : m.name || m.grp)}</div>
-            <div className={'r'}>{formats.round1(m.getMass()) || m.fuel || 0}{units.T}</div>
+            <div className={'r'}>{formats.round1(mass)}{units.T}</div>
 	    <div/>
             <div className={'cb'}>
                 { m.grp == 'bh' && m.name ? <div className='l'>{translate(m.name)}</div> : null }