diff --git a/beat/web/experiments/models.py b/beat/web/experiments/models.py
index 8d9bef4cbf4cdd759e6e1d3f3e7ae1fd1b71bf0e..60191be87563e39eb0d1306661b15dffd109a7ed 100644
--- a/beat/web/experiments/models.py
+++ b/beat/web/experiments/models.py
@@ -407,6 +407,10 @@ class Experiment(Shareable):
 
         is_adding = self._state.adding
 
+        if not is_adding and self._loaded_status != self.status:
+            if self.status in [Experiment.DONE, Experiment.FAILED]:
+                self.email_dispatch = True
+
         # Invoke the base implementation
         super(Experiment, self).save(*args, **kwargs)
 
@@ -461,10 +465,6 @@ class Experiment(Shareable):
 
                 self.referenced_algorithms.add(algorithm_db)
 
-        if not is_adding and self._loaded_status != self.status:
-            if self.status in [Experiment.DONE, Experiment.FAILED]:
-                self.email_dispatch = True
-
 
     def email(self):
         '''e-mails owners and shared parties about this experiment status'''
@@ -493,7 +493,6 @@ class Experiment(Shareable):
                     self, traceback.format_exc())
 
 
-
     def share(self, users=None, teams=None, algorithms_infos={}):
         self._share_dataformats(users=users, teams=teams)
         self.__share_algorithms(users=users, teams=teams, algorithms_infos=algorithms_infos)