diff --git a/controller/fit.py b/controller/fit.py
index 0c01ad009..ec129beab 100644
--- a/controller/fit.py
+++ b/controller/fit.py
@@ -90,6 +90,9 @@ class Fit(object):
 
     def removeModule(self, fitID, position):
         fit = eos.db.getFit(fitID)
+        if fit.modules[position].isEmpty:
+            return False
+
         fit.modules.toDummy(position)
         eos.db.commit()
         fit.clear()
diff --git a/gui/fittingView.py b/gui/fittingView.py
index 905948af8..318e5762b 100644
--- a/gui/fittingView.py
+++ b/gui/fittingView.py
@@ -64,9 +64,10 @@ class FittingView(d.Display):
         row, _ = self.HitTest(event.Position)
         if row != -1:
             cFit = controller.Fit.getInstance()
-            cFit.removeModule(self.activeFitID, self.mods[self.GetItemData(row)].position)
+            trigger = cFit.removeModule(self.activeFitID, self.mods[self.GetItemData(row)].position)
 
-            wx.PostEvent(self.mainFrame, FitChanged(fitID=self.activeFitID))
+            if trigger:
+                wx.PostEvent(self.mainFrame, FitChanged(fitID=self.activeFitID))
 
     def fitChanged(self, event):
         cFit = controller.Fit.getInstance()