diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailDataManager.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailDataManager.java
index 3cd76dbf77ac6b1a355c84770a564c5aa0798c1b..c03fccc91756995b9980601da1251cb57e6069ae 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailDataManager.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailDataManager.java
@@ -112,6 +112,7 @@ class EntityTrackingEmailDataManager
         if (emailDataOrNull == null)
         {
             emailDataOrNull = new EntityTrackingEmailData(recipient);
+            dataByRecipient.put(recipient, emailDataOrNull);
         }
         return emailDataOrNull;
     }