diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 4f5ac91416..e29c3e7b85 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3794,7 +3794,8 @@ class Core {
                     if (rule.stop)
                         break;
                 }
-            if (executed)
+            if (executed &&
+                    !message.hasKeyword(MessageHelper.FLAG_FILTERED))
                 EntityOperation.queue(context, message, EntityOperation.KEYWORD, MessageHelper.FLAG_FILTERED, true);
         } catch (Throwable ex) {
             Log.e(ex);