diff --git a/components/esp_hid/src/bt_hidh.c b/components/esp_hid/src/bt_hidh.c
index 1a17e6aa35..0fe44b21f8 100644
--- a/components/esp_hid/src/bt_hidh.c
+++ b/components/esp_hid/src/bt_hidh.c
@@ -241,28 +241,33 @@ static esp_err_t esp_bt_hidh_dev_report_write(esp_hidh_dev_t *dev, size_t map_in
         return ESP_FAIL;
     }
 
+#define BT_HDR_HID_DATA_OFFSET 14 //this equals to L2CAP_MIN_OFFSET + 1 (1 byte to hold the HID transaction header)
+
     uint8_t *pbuf_data;
-    BT_HDR *p_buf = (BT_HDR *)malloc((uint16_t) (len + 14 + sizeof(BT_HDR)));
+    BT_HDR *p_buf = (BT_HDR *)malloc((uint16_t) (len + 1 + BT_HDR_HID_DATA_OFFSET + sizeof(BT_HDR)));
 
-    if (p_buf != NULL) {
-        p_buf->len = len + 1;
-        p_buf->offset = 14;
+    if (p_buf == NULL) {
+        ESP_LOGE(TAG, "Could not allocate BT_HDR buffer");
+        return ESP_ERR_NO_MEM;
+    }
 
-        pbuf_data = (uint8_t *) (p_buf + 1) + p_buf->offset;
-        pbuf_data[0] = report_id;
-        memcpy(pbuf_data + 1, data, len);
+    p_buf->len = len + 1;
+    p_buf->offset = BT_HDR_HID_DATA_OFFSET;
 
-        if (report_type == ESP_HID_REPORT_TYPE_OUTPUT) {
-            p_buf->layer_specific = BTA_HH_RPTT_OUTPUT;
-            BTA_HhSendData(dev->bt.handle, dev->bda, p_buf);
-        } else {
-            BTA_HhSetReport(dev->bt.handle, report_type, p_buf);
-            WAIT_DEV(dev);
-        }
-        if (dev->status) {
-            ESP_LOGE(TAG, "Write %s: %s", esp_hid_report_type_str(report_type), s_bta_hh_status_names[dev->status]);
-            return ESP_FAIL;
-        }
+    pbuf_data = (uint8_t *) (p_buf + 1) + p_buf->offset;
+    pbuf_data[0] = report_id;
+    memcpy(pbuf_data + 1, data, len);
+
+    if (report_type == ESP_HID_REPORT_TYPE_OUTPUT) {
+        p_buf->layer_specific = BTA_HH_RPTT_OUTPUT;
+        BTA_HhSendData(dev->bt.handle, dev->bda, p_buf);
+    } else {
+        BTA_HhSetReport(dev->bt.handle, report_type, p_buf);
+        WAIT_DEV(dev);
+    }
+    if (dev->status) {
+        ESP_LOGE(TAG, "Write %s: %s", esp_hid_report_type_str(report_type), s_bta_hh_status_names[dev->status]);
+        return ESP_FAIL;
     }
     return ESP_OK;
 }