diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2d6b2403..5362b67f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,8 +15,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - example: gatt_streamer_server and le_streamer_client report DLE and PHY changes
 - gatt_client: queue requests with gatt_client_request_to_send_gatt_query and gatt_client_request_to_write_without_response 
 - esp32: warn about unsuitable sdkconfig
-- esp32: drop support for Makefile projects from esp-idf 3.x
-
+- esp32: add BTstack component config options via menuconfig
+- esp32: allow to disable default audio i2s driver via component config
+- 
 ## Fixed
 - hci: fix set extended scan response
 - btstack_stdin_embedded: use timer to poll RTT input, fix for tickless RTOS
@@ -28,7 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - bluetooth: indicated identity address in resolved address type names
 - btstack_audio: added get_samplerate function to help with audio sample rate synchronization 
 - btstack_flash_bank: write empty tag instead of overwriting existing tag with ENABLE_TLV_FLASH_WRITE_ONCE
-
+- esp32: drop support for Makefile projects from esp-idf 3.x
 
 ## Release v1.5.5
 
diff --git a/port/esp32/components/btstack/Kconfig b/port/esp32/components/btstack/Kconfig
new file mode 100644
index 000000000..4038ec213
--- /dev/null
+++ b/port/esp32/components/btstack/Kconfig
@@ -0,0 +1,9 @@
+menu "BTstack Configuration"
+
+config BTSTACK_AUDIO
+    bool "I2S Audio driver"
+    default y
+    help
+        Select this option to enable BTstack's default audio driver
+
+endmenu
diff --git a/port/esp32/components/btstack/btstack_port_esp32.c b/port/esp32/components/btstack/btstack_port_esp32.c
index 9543420c6..3e66b5fab 100644
--- a/port/esp32/components/btstack/btstack_port_esp32.c
+++ b/port/esp32/components/btstack/btstack_port_esp32.c
@@ -413,9 +413,11 @@ uint8_t btstack_init(void){
     hci_event_callback_registration.callback = &packet_handler;
     hci_add_event_handler(&hci_event_callback_registration);
 
+#if CONFIG_BTSTACK_AUDIO
     // setup i2s audio for sink and source
     btstack_audio_sink_set_instance(btstack_audio_esp32_sink_get_instance());
     btstack_audio_source_set_instance(btstack_audio_esp32_source_get_instance());
+#endif
 
     return ERROR_CODE_SUCCESS;
 }