diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java
index af0f43c26af9743f133e135153177ac4a35e7909..187914c6c037f39c1fd001d20269c16a291daf0c 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java
@@ -142,7 +142,7 @@ public class TrackingBO
         	LogUtils.info("Not sending out any emails.");
         }
 
-        if (!params.getDebug()) {
+        if (!params.getDebug() && changedEntities != null) {
         	LogUtils.info("Saving new state to tracking database.");
         	saveTrackingState(prevTrackingState, changedEntities, trackingDAO);
         }