diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js
index 07e539c7..705b5bea 100755
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -889,8 +889,9 @@ export default class Ship {
       }
     }
 
-    this.recalculateMass();
     if (!preventUpdate) {
+      // Must recalculate mass first, as movement, jump etc. relies on it
+      this.recalculateMass();
       if (dpsChanged) {
         this.recalculateDps();
       }