diff --git a/lib/opusfile/CMakeLists.txt b/lib/opusfile/CMakeLists.txt
index 94d1af9e..f9b5e4ce 100644
--- a/lib/opusfile/CMakeLists.txt
+++ b/lib/opusfile/CMakeLists.txt
@@ -17,4 +17,6 @@ set(OPUS_BUILD_TESTING OFF)
 set(OPUS_BUILD_SHARED_LIBS OFF)
 
 add_subdirectory($ENV{PROJ_PATH}/lib/opus ${CMAKE_CURRENT_BINARY_DIR}/opus)
+target_compile_definitions(opus PRIVATE CUSTOM_SUPPORT)
+target_include_directories(opus PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_link_libraries(${COMPONENT_LIB} PUBLIC opus)
diff --git a/lib/opusfile/include/custom_support.h b/lib/opusfile/include/custom_support.h
new file mode 100644
index 00000000..d99cc5e2
--- /dev/null
+++ b/lib/opusfile/include/custom_support.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "esp_heap_caps.h"
+#include "opus_defines.h"
+
+#define OVERRIDE_OPUS_ALLOC
+#define OVERRIDE_OPUS_FREE
+
+static OPUS_INLINE void *opus_alloc (size_t size)
+{
+   return heap_caps_malloc(size, MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL);
+}
+
+static OPUS_INLINE void opus_free (void *ptr)
+{
+   heap_caps_free(ptr);
+}
diff --git a/src/audio/audio_fsm.cpp b/src/audio/audio_fsm.cpp
index 31d006fe..54ffa51d 100644
--- a/src/audio/audio_fsm.cpp
+++ b/src/audio/audio_fsm.cpp
@@ -162,7 +162,7 @@ void Uninitialised::react(const system_fsm::BootComplete& ev) {
   sServices = ev.services;
 
   constexpr size_t kDrainBufferSize =
-      drivers::kI2SBufferLengthFrames * sizeof(sample::Sample) * 2 * 8;
+      drivers::kI2SBufferLengthFrames * sizeof(sample::Sample) * 8;
   ESP_LOGI(kTag, "allocating drain buffer, size %u KiB",
            kDrainBufferSize / 1024);
   StreamBufferHandle_t stream = xStreamBufferCreateWithCaps(