diff --git a/crates/jmap/src/api/form.rs b/crates/jmap/src/api/form.rs
index 2d0025f6..1ef718a5 100644
--- a/crates/jmap/src/api/form.rs
+++ b/crates/jmap/src/api/form.rs
@@ -122,6 +122,11 @@ impl FormHandler for Server {
             }
         }
 
+        // Discard empty forms
+        if failure.is_none() && form_data.fields().all(|(_, value)| value.trim().is_empty()) {
+            failure = Some(Cow::Borrowed("Empty form"));
+        }
+
         if failure.is_none() {
             // Build body
             let mut body = String::with_capacity(1024);