diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index eda0d6920f..970651e996 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -279,7 +279,7 @@ public class EntityRule {
 
     boolean execute(Context context, EntityMessage message) throws JSONException, IOException {
         boolean executed = _execute(context, message);
-        if (executed) {
+        if (id != null && executed) {
             DB db = DB.getInstance(context);
             db.rule().applyRule(id);
         }