diff --git a/src/hci.h b/src/hci.h
index ef685c9f8..36e2f3e69 100644
--- a/src/hci.h
+++ b/src/hci.h
@@ -108,14 +108,20 @@ extern "C" {
     #endif
 #endif
 
-// additional pre- and post-packet buffer for packets to Bluetooth module
-// - pre-buffer used for HCI Transport H4 variants
-#define HCI_OUTGOING_PRE_BUFFER_SIZE  1
-#define HCI_OUTGOING_POST_BUFFER_SIZE 0
+// additional pre-buffer space for packets to Bluetooth module, for now, used for HCI Transport H4 DMA
+#ifdef HAVE_HOST_CONTROLLER_API
+#define HCI_OUTGOING_PRE_BUFFER_SIZE 0
+#else
+#define HCI_OUTGOING_PRE_BUFFER_SIZE 1
+#endif
 
 // BNEP may uncompress the IP Header by 16 bytes
 #ifndef HCI_INCOMING_PRE_BUFFER_SIZE
+#ifdef ENABLE_CLASSIC
 #define HCI_INCOMING_PRE_BUFFER_SIZE (16 - HCI_ACL_HEADER_SIZE - 4)
+#else
+#define HCI_INCOMING_PRE_BUFFER_SIZE 0
+#endif
 #endif
 
 //