diff --git a/include/audio/audio_device_interface.hpp b/include/audio/audio_device_interface.hpp
index 4534f9e3..de70c77a 100644
--- a/include/audio/audio_device_interface.hpp
+++ b/include/audio/audio_device_interface.hpp
@@ -7,7 +7,9 @@
 
 class AudioDeviceInterface {
   protected:
-	using Samples = Common::RingBuffer<s16, 0x2000 * 2>;
+	static constexpr usize maxFrameCount = 0x2000;
+
+	using Samples = Common::RingBuffer<s16, maxFrameCount * 2>;
 	using RenderBatchCallback = usize (*)(const s16*, usize);
 
 	Samples* samples = nullptr;
diff --git a/include/audio/libretro_audio_device.hpp b/include/audio/libretro_audio_device.hpp
index ee126cdb..53629877 100644
--- a/include/audio/libretro_audio_device.hpp
+++ b/include/audio/libretro_audio_device.hpp
@@ -28,7 +28,7 @@ class LibretroAudioDevice : public AudioDeviceInterface {
 
 	void renderBatch(RenderBatchCallback callback) override {
 		if (running) {
-			static constexpr int frameCount = 547;
+			static constexpr int frameCount = maxFrameCount;
 			static constexpr int channelCount = 2;
 			static s16 audioBuffer[frameCount * channelCount];