diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 502f1c8a9b..3e56dd56e8 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -390,6 +390,10 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                         break;
 
                     EntityOperation op = ops.get(0);
+                    if (db.operation().getOperation(op.id) == null) {
+                        ops.remove(op);
+                        continue;
+                    }
 
                     EntityMessage message = null;
                     if (op.message != null)