diff --git a/quickwit/quickwit-codegen/example/src/codegen/hello.rs b/quickwit/quickwit-codegen/example/src/codegen/hello.rs
index d8cff481d0d..8d4079c63c1 100644
--- a/quickwit/quickwit-codegen/example/src/codegen/hello.rs
+++ b/quickwit/quickwit-codegen/example/src/codegen/hello.rs
@@ -126,8 +126,8 @@ impl HelloClient {
     ) -> HelloClient {
         let connection_keys_watcher = balance_channel.connection_keys_watcher();
         let client = hello_grpc_client::HelloGrpcClient::new(balance_channel)
-            .max_decoding_message_size(10 * 1024 * 1024)
-            .max_encoding_message_size(10 * 1024 * 1024);
+            .max_decoding_message_size(20 * 1024 * 1024)
+            .max_encoding_message_size(20 * 1024 * 1024);
         let adapter = HelloGrpcClientAdapter::new(client, connection_keys_watcher);
         Self::new(adapter)
     }
diff --git a/quickwit/quickwit-codegen/src/codegen.rs b/quickwit/quickwit-codegen/src/codegen.rs
index 5ff7e6dbbc5..ed413201eab 100644
--- a/quickwit/quickwit-codegen/src/codegen.rs
+++ b/quickwit/quickwit-codegen/src/codegen.rs
@@ -588,8 +588,8 @@ fn generate_client(context: &CodegenContext) -> TokenStream {
             {
                 let connection_keys_watcher = balance_channel.connection_keys_watcher();
                 let client = #grpc_client_package_name::#grpc_client_name::new(balance_channel)
-                    .max_decoding_message_size(10 * 1024 * 1024)
-                    .max_encoding_message_size(10 * 1024 * 1024);
+                    .max_decoding_message_size(20 * 1024 * 1024)
+                    .max_encoding_message_size(20 * 1024 * 1024);
                 let adapter = #grpc_client_adapter_name::new(client, connection_keys_watcher);
                 Self::new(adapter)
             }
diff --git a/quickwit/quickwit-ingest/src/codegen/ingest_service.rs b/quickwit/quickwit-ingest/src/codegen/ingest_service.rs
index 5db6aea399d..280a6c112a8 100644
--- a/quickwit/quickwit-ingest/src/codegen/ingest_service.rs
+++ b/quickwit/quickwit-ingest/src/codegen/ingest_service.rs
@@ -238,8 +238,8 @@ impl IngestServiceClient {
         let client = ingest_service_grpc_client::IngestServiceGrpcClient::new(
                 balance_channel,
             )
-            .max_decoding_message_size(10 * 1024 * 1024)
-            .max_encoding_message_size(10 * 1024 * 1024);
+            .max_decoding_message_size(20 * 1024 * 1024)
+            .max_encoding_message_size(20 * 1024 * 1024);
         let adapter = IngestServiceGrpcClientAdapter::new(
             client,
             connection_keys_watcher,
diff --git a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.control_plane.rs b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.control_plane.rs
index 8715c0436d1..5587d11180e 100644
--- a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.control_plane.rs
+++ b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.control_plane.rs
@@ -193,8 +193,8 @@ impl ControlPlaneServiceClient {
         let client = control_plane_service_grpc_client::ControlPlaneServiceGrpcClient::new(
                 balance_channel,
             )
-            .max_decoding_message_size(10 * 1024 * 1024)
-            .max_encoding_message_size(10 * 1024 * 1024);
+            .max_decoding_message_size(20 * 1024 * 1024)
+            .max_encoding_message_size(20 * 1024 * 1024);
         let adapter = ControlPlaneServiceGrpcClientAdapter::new(
             client,
             connection_keys_watcher,
diff --git a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.indexing.rs b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.indexing.rs
index e7d3715d5d2..93d095a2330 100644
--- a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.indexing.rs
+++ b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.indexing.rs
@@ -93,8 +93,8 @@ impl IndexingServiceClient {
         let client = indexing_service_grpc_client::IndexingServiceGrpcClient::new(
                 balance_channel,
             )
-            .max_decoding_message_size(10 * 1024 * 1024)
-            .max_encoding_message_size(10 * 1024 * 1024);
+            .max_decoding_message_size(20 * 1024 * 1024)
+            .max_encoding_message_size(20 * 1024 * 1024);
         let adapter = IndexingServiceGrpcClientAdapter::new(
             client,
             connection_keys_watcher,
diff --git a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.ingest.ingester.rs b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.ingest.ingester.rs
index e8afa95ff53..6db5fb9b389 100644
--- a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.ingest.ingester.rs
+++ b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.ingest.ingester.rs
@@ -575,8 +575,8 @@ impl IngesterServiceClient {
         let client = ingester_service_grpc_client::IngesterServiceGrpcClient::new(
                 balance_channel,
             )
-            .max_decoding_message_size(10 * 1024 * 1024)
-            .max_encoding_message_size(10 * 1024 * 1024);
+            .max_decoding_message_size(20 * 1024 * 1024)
+            .max_encoding_message_size(20 * 1024 * 1024);
         let adapter = IngesterServiceGrpcClientAdapter::new(
             client,
             connection_keys_watcher,
diff --git a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.ingest.router.rs b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.ingest.router.rs
index 443c9005fa7..3dd264ad14d 100644
--- a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.ingest.router.rs
+++ b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.ingest.router.rs
@@ -180,8 +180,8 @@ impl IngestRouterServiceClient {
         let client = ingest_router_service_grpc_client::IngestRouterServiceGrpcClient::new(
                 balance_channel,
             )
-            .max_decoding_message_size(10 * 1024 * 1024)
-            .max_encoding_message_size(10 * 1024 * 1024);
+            .max_decoding_message_size(20 * 1024 * 1024)
+            .max_encoding_message_size(20 * 1024 * 1024);
         let adapter = IngestRouterServiceGrpcClientAdapter::new(
             client,
             connection_keys_watcher,
diff --git a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.metastore.rs b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.metastore.rs
index f56694777e4..c1a0ace27ff 100644
--- a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.metastore.rs
+++ b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.metastore.rs
@@ -752,8 +752,8 @@ impl MetastoreServiceClient {
         let client = metastore_service_grpc_client::MetastoreServiceGrpcClient::new(
                 balance_channel,
             )
-            .max_decoding_message_size(10 * 1024 * 1024)
-            .max_encoding_message_size(10 * 1024 * 1024);
+            .max_decoding_message_size(20 * 1024 * 1024)
+            .max_encoding_message_size(20 * 1024 * 1024);
         let adapter = MetastoreServiceGrpcClientAdapter::new(
             client,
             connection_keys_watcher,
diff --git a/quickwit/quickwit-rest-client/src/models.rs b/quickwit/quickwit-rest-client/src/models.rs
index 6416a8ec286..dd1577abd25 100644
--- a/quickwit/quickwit-rest-client/src/models.rs
+++ b/quickwit/quickwit-rest-client/src/models.rs
@@ -48,21 +48,25 @@ impl ApiResponse {
         Ok(())
     }
 
-    async fn api_error(self) -> Error {
-        let code = self.inner.status();
-        if let Ok(error_payload) = self.inner.json::<ErrorResponsePayload>().await {
-            Error::from(ApiError {
-                message: Some(error_payload.message),
-                code,
-            })
+    async fn extract_error_message(self) -> Option<String> {
+        let error_body_bytes = self.inner.bytes().await.ok()?;
+        let error_body_text = std::str::from_utf8(&error_body_bytes).ok()?;
+        if let Ok(error_payload) = serde_json::from_str::<ErrorResponsePayload>(error_body_text) {
+            Some(error_payload.message)
         } else {
-            Error::from(ApiError {
-                message: None,
-                code,
-            })
+            Some(error_body_text.to_string())
         }
     }
 
+    async fn api_error(self) -> Error {
+        let code = self.inner.status();
+        let error_message = self.extract_error_message().await;
+        Error::from(ApiError {
+            message: error_message,
+            code,
+        })
+    }
+
     pub async fn deserialize<T: DeserializeOwned>(self) -> Result<T, Error> {
         if self.inner.status().is_client_error() || self.inner.status().is_server_error() {
             Err(self.api_error().await)