diff --git a/src/platform/qt/ConfigController.cpp b/src/platform/qt/ConfigController.cpp
index 65ee51528..021908680 100644
--- a/src/platform/qt/ConfigController.cpp
+++ b/src/platform/qt/ConfigController.cpp
@@ -107,7 +107,7 @@ ConfigController::ConfigController(QObject* parent)
m_opts.audioSync = GameController::AUDIO_SYNC;
m_opts.videoSync = GameController::VIDEO_SYNC;
m_opts.fpsTarget = 60;
- m_opts.audioBuffers = 2048;
+ m_opts.audioBuffers = 1536;
m_opts.volume = GBA_AUDIO_VOLUME_MAX;
m_opts.logLevel = GBA_LOG_WARN | GBA_LOG_ERROR | GBA_LOG_FATAL | GBA_LOG_STATUS;
m_opts.rewindEnable = false;
diff --git a/src/platform/qt/SettingsView.ui b/src/platform/qt/SettingsView.ui
index bfd7af451..b59dae40a 100644
--- a/src/platform/qt/SettingsView.ui
+++ b/src/platform/qt/SettingsView.ui
@@ -62,26 +62,41 @@
true
- 2048
+ 1536
- 2
+ 3
-
512
+ -
+
+ 768
+
+
-
1024
+ -
+
+ 1536
+
+
-
2048
+ -
+
+ 3072
+
+
-
4096
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 6fd233b60..8ee53dca2 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -987,20 +987,6 @@ void Window::setupMenu(QMenuBar* menubar) {
avMenu->addSeparator();
- QMenu* buffersMenu = avMenu->addMenu(tr("Audio buffer &size"));
- ConfigOption* buffers = m_config->addOption("audioBuffers");
- buffers->connect([this](const QVariant& value) {
- emit audioBufferSamplesChanged(value.toInt());
- }, this);
- buffers->addValue(tr("512"), 512, buffersMenu);
- buffers->addValue(tr("768"), 768, buffersMenu);
- buffers->addValue(tr("1024"), 1024, buffersMenu);
- buffers->addValue(tr("2048"), 2048, buffersMenu);
- buffers->addValue(tr("4096"), 4096, buffersMenu);
- m_config->updateOption("audioBuffers");
-
- avMenu->addSeparator();
-
QMenu* target = avMenu->addMenu(tr("FPS target"));
ConfigOption* fpsTargetOption = m_config->addOption("fpsTarget");
fpsTargetOption->connect([this](const QVariant& value) {