diff --git a/lib/features/email/data/network/email_api.dart b/lib/features/email/data/network/email_api.dart
index 682005bb8..4446ed769 100644
--- a/lib/features/email/data/network/email_api.dart
+++ b/lib/features/email/data/network/email_api.dart
@@ -365,12 +365,17 @@ class EmailAPI with HandleSetErrorMixin {
     AccountId accountId,
     MoveToMailboxRequest moveRequest
   ) async {
-
-    requireCapability(moveRequest.session, accountId, [CapabilityIdentifier.jmapCore, CapabilityIdentifier.jmapMail]);
+    requireCapability(
+      moveRequest.session,
+      accountId,
+      [CapabilityIdentifier.jmapCore, CapabilityIdentifier.jmapMail]
+    );
 
     final coreCapability = moveRequest.session.getCapabilityProperties<CoreCapability>(
-        accountId, CapabilityIdentifier.jmapCore);
-    final maxMethodCount = coreCapability.maxCallsInRequest?.value.toInt() ?? 0;
+      accountId,
+      CapabilityIdentifier.jmapCore
+    );
+    final maxMethodCount = coreCapability.maxCallsInRequest?.value.toInt() ?? CapabilityIdentifierExtension.defaultMaxCallsInRequest;
 
     var start = 0;
     var end = 0;
diff --git a/lib/features/mailbox/data/network/mailbox_api.dart b/lib/features/mailbox/data/network/mailbox_api.dart
index a88ee1901..485de2de0 100644
--- a/lib/features/mailbox/data/network/mailbox_api.dart
+++ b/lib/features/mailbox/data/network/mailbox_api.dart
@@ -186,10 +186,11 @@ class MailboxAPI with HandleSetErrorMixin {
   }
 
   Future<Map<Id, SetError>> deleteMultipleMailbox(Session session, AccountId accountId, List<MailboxId> mailboxIds) async {
-
     final coreCapability = session.getCapabilityProperties<CoreCapability>(
-        accountId, CapabilityIdentifier.jmapCore);
-    final maxMethodCount = coreCapability.maxCallsInRequest?.value.toInt() ?? 0;
+      accountId,
+      CapabilityIdentifier.jmapCore
+    );
+    final maxMethodCount = coreCapability.maxCallsInRequest?.value.toInt() ?? CapabilityIdentifierExtension.defaultMaxCallsInRequest;
 
     final Map<Id,SetError> finalDeletedMailboxErrors = {};
     var start = 0;
diff --git a/lib/main/error/capability_validator.dart b/lib/main/error/capability_validator.dart
index abf09b54e..5741f74be 100644
--- a/lib/main/error/capability_validator.dart
+++ b/lib/main/error/capability_validator.dart
@@ -41,6 +41,8 @@ extension ListCapabilityIdentifierExtension on List<CapabilityIdentifier> {
 
 extension CapabilityIdentifierExtension on CapabilityIdentifier {
 
+  static const int defaultMaxCallsInRequest = 1;
+
   bool isSupported(Session session, AccountId accountId) {
     try {
       requireCapability(session, accountId, [this]);