diff --git a/src/zdatachannel_service.c b/src/zdatachannel_service.c
index ad0727f..d19f583 100644
--- a/src/zdatachannel_service.c
+++ b/src/zdatachannel_service.c
@@ -196,6 +196,10 @@ uint32_t zdatachannel_data_send(uint8_t *p_data, uint16_t *p_length) {
     return NRF_ERROR_INVALID_PARAM;
   }
 
+  if(*p_length==0){
+    return 0;
+  }
+
   memset(&hvx_params, 0, sizeof(hvx_params));
 
   hvx_params.handle = p_datachannel->cmd_tx_handles.value_handle;