diff --git a/source/src/cip/cipassembly.c b/source/src/cip/cipassembly.c
index 2709761ec..ef015ec84 100644
--- a/source/src/cip/cipassembly.c
+++ b/source/src/cip/cipassembly.c
@@ -136,7 +136,7 @@ CipInstance *CreateAssemblyObject(const CipInstanceNum instance_id,
 
 EipStatus NotifyAssemblyConnectedDataReceived(CipInstance *const instance,
                                               const EipUint8 *const data,
-                                              const EipUint16 data_length) {
+                                              const size_t data_length) {
   /* empty path (path size = 0) need to be checked and taken care of in future */
   /* copy received data to Attribute 3 */
   const CipByteArray *const assembly_byte_array =
diff --git a/source/src/cip/cipassembly.h b/source/src/cip/cipassembly.h
index 8fb1c0cea..aebc21854 100644
--- a/source/src/cip/cipassembly.h
+++ b/source/src/cip/cipassembly.h
@@ -56,6 +56,6 @@ void ShutdownAssemblies(void);
  */
 EipStatus NotifyAssemblyConnectedDataReceived(CipInstance *const instance,
                                               const EipUint8 *const data,
-                                              const EipUint16 data_length);
+                                              const size_t data_length);
 
 #endif /* OPENER_CIPASSEMBLY_H_ */