diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index e16dc9d8b..484e314fe 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -153,6 +153,8 @@ class Fit(object):
     def ship(self, ship):
         self.__ship = ship
         self.shipID = ship.item.ID if ship is not None else None
+        #  set mode of new ship
+        self.mode = self.ship.checkModeItem(None) if ship is not None else None
 
     @property
     def drones(self):
diff --git a/service/fit.py b/service/fit.py
index 52c0e48cb..e731c3edf 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -147,7 +147,6 @@ class Fit(object):
     def newFit(self, shipID, name=None):
         fit = eos.types.Fit()
         fit.ship = eos.types.Ship(eos.db.getItem(shipID))
-        fit.mode = fit.ship.checkModeItem(None)
         fit.name = name if name is not None else "New %s" % fit.ship.item.name
         fit.damagePattern = self.pattern
         fit.targetResists = self.targetResists