diff --git a/core/src/comms/chunker.rs b/core/src/comms/chunker.rs
index 70eaba911..3939ae4b1 100644
--- a/core/src/comms/chunker.rs
+++ b/core/src/comms/chunker.rs
@@ -108,7 +108,7 @@ impl Chunker {
         sequence_number: u32,
         request_id: u32,
         max_message_size: usize,
-        max_chunk_count: usize,
+        max_chunk_size: usize,
         secure_channel: &SecureChannel,
         supported_message: &SupportedMessage,
     ) -> std::result::Result<Vec<MessageChunk>, StatusCode> {
@@ -143,9 +143,7 @@ impl Chunker {
             let _ = supported_message.encode(&mut stream)?;
             let data = stream.into_inner();
 
-            let result = if max_message_size > 0 && max_chunk_count > 0 {
-                let max_chunk_size = max_message_size / max_chunk_count;
-
+            let result = if max_chunk_size > 0 {
                 let max_body_per_chunk = MessageChunk::body_size_from_message_size(
                     message_type,
                     secure_channel,
diff --git a/core/src/comms/message_writer.rs b/core/src/comms/message_writer.rs
index 144024543..0a9b57224 100644
--- a/core/src/comms/message_writer.rs
+++ b/core/src/comms/message_writer.rs
@@ -62,7 +62,7 @@ impl MessageWriter {
             self.last_sent_sequence_number + 1,
             request_id,
             self.max_message_size,
-            self.max_chunk_count,
+            0,
             secure_channel,
             &message,
         )?;