diff --git a/barnard-ui b/barnard-ui
index 1ddf162..1deb9f4 100755
--- a/barnard-ui
+++ b/barnard-ui
@@ -454,7 +454,7 @@ connect() {
         barnardArgs+=(-certificate "$certFile")
     fi
 
-    command barnard "${barnardArgs[@]}" --fifo "$configDir/cmd" --buffers 16 |& log
+    command barnard "${barnardArgs[@]}" --fifo "$configDir/cmd" --buffers 64 |& log
     barnardStatus=${PIPESTATUS[0]}
     if (( barnardStatus != 0 )); then
         msgbox "$(gettext "Barnard exited with status") $barnardStatus. $(gettext "See log:") $logFile"
diff --git a/gumble/gumble/audio_buffer_test.go b/gumble/gumble/audio_buffer_test.go
index 68cb826..d573de8 100644
--- a/gumble/gumble/audio_buffer_test.go
+++ b/gumble/gumble/audio_buffer_test.go
@@ -36,6 +36,13 @@ func TestAudioBufferCount(t *testing.T) {
 	}
 }
 
+func TestDefaultAudioBufferCountPreservesStablePlaybackCapacity(t *testing.T) {
+	config := NewConfig()
+	if got := config.AudioBufferCount(); got != 64 {
+		t.Fatalf("default AudioBufferCount() = %d, want 64", got)
+	}
+}
+
 func TestAudioListenerStreamBufferingAndCleanup(t *testing.T) {
 	var listeners AudioListeners
 	events := make(chan *AudioStreamEvent, 1)
diff --git a/gumble/gumble/config.go b/gumble/gumble/config.go
index 780b7f4..94ee77e 100644
--- a/gumble/gumble/config.go
+++ b/gumble/gumble/config.go
@@ -40,7 +40,7 @@ const AudioMinimumBufferCount = 3
 // NewConfig returns a new Config struct with default values set.
 func NewConfig() *Config {
 	return &Config{
-		Buffers:        8,
+		Buffers:        64,
 		AudioInterval:  AudioDefaultInterval,
 		AudioDataBytes: AudioDefaultDataBytes,
 	}
diff --git a/main.go b/main.go
index a6094fa..6acc12f 100644
--- a/main.go
+++ b/main.go
@@ -111,7 +111,7 @@ func main() {
 	fifo := flag.String("fifo", "", "path of a FIFO from which to read commands")
 	serverSet := false
 	usernameSet := false
-	buffers := flag.Int("buffers", 16, "per-user audio buffer count (minimum 3)")
+	buffers := flag.Int("buffers", 64, "per-user audio buffer count (minimum 3)")
 	profile := flag.Bool("profile", false, "add http server to serve profiles")
 	noiseSuppressionEnabled := flag.Bool("noise-suppression", false, "enable noise suppression for microphone input")