diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index a358254ea..2caa5cc45 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -100,10 +100,10 @@ class Fit(object):
         self.extraAttributes = ModifiedAttributeDict(self)
         self.extraAttributes.original = self.EXTRA_ATTRIBUTES
         self.ship = Ship(db.getItem(self.shipID)) if self.shipID is not None else None
-        if self.ship is not None and self.modeID is not None:
-            self._mode = self.ship.checkModeItem(db.getItem(self.modeID))
+        if self.ship is not None:
+            self.mode = self.ship.checkModeItem(db.getItem(self.modeID) if self.modeID else None)
         else:
-            self._mode = None
+            self.mode = None
 
     @property
     def targetResists(self):
diff --git a/service/fit.py b/service/fit.py
index e731c3edf..52c0e48cb 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -147,6 +147,7 @@ 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