diff --git a/backend/player/buffered_streamer.go b/backend/player/buffered_streamer.go
new file mode 100644
index 0000000..6d711fd
--- /dev/null
+++ b/backend/player/buffered_streamer.go
@@ -0,0 +1,189 @@
+package player
+
+import (
+	"sync"
+	"time"
+
+	"github.com/gopxl/beep/v2"
+)
+
+// BufferedStreamer wraps a beep.Streamer with a goroutine-driven
+// read-ahead ring buffer. It decouples the source streamer's I/O
+// timing from the speaker callback's real-time deadline, preventing
+// audible glitches caused by disk stalls, GC pauses, or CPU
+// scheduling delays.
+//
+// The read-ahead goroutine continuously fills the ring buffer from
+// the source. The speaker callback drains the ring buffer without
+// ever touching the source directly. If the ring buffer is
+// temporarily empty (read-ahead hasn't caught up), Stream returns
+// silence rather than blocking or signaling end-of-stream.
+type BufferedStreamer struct {
+	mu      sync.Mutex
+	source  beep.Streamer
+	ring    [][2]float64
+	readPos int
+	writPos int
+	count   int
+	done    bool
+	err     error
+	closed  chan struct{}
+}
+
+// NewBufferedStreamer creates a BufferedStreamer that pre-fills
+// bufferSize samples from source via a background goroutine.
+// A typical bufferSize is 2× the sample rate (~2 seconds of audio).
+func NewBufferedStreamer(
+	source beep.Streamer,
+	bufferSize int,
+) *BufferedStreamer {
+	bs := &BufferedStreamer{
+		source: source,
+		ring:   make([][2]float64, bufferSize),
+		closed: make(chan struct{}),
+	}
+
+	go bs.readAhead()
+
+	return bs
+}
+
+// readAhead continuously reads from the source into the ring buffer
+// until the source is drained, an error occurs, or Close is called.
+func (bs *BufferedStreamer) readAhead() {
+	// Temporary buffer for reading from source outside the lock.
+	// 512 samples per chunk keeps the critical section short.
+	const chunkSize = 512
+
+	tmp := make([][2]float64, chunkSize)
+
+	for {
+		// Check if closed.
+		select {
+		case <-bs.closed:
+			return
+		default:
+		}
+
+		bs.mu.Lock()
+		space := len(bs.ring) - bs.count
+
+		if space == 0 {
+			// Buffer full — release lock and wait briefly.
+			bs.mu.Unlock()
+
+			select {
+			case <-bs.closed:
+				return
+			case <-time.After(1 * time.Millisecond):
+			}
+
+			continue
+		}
+
+		// Determine how many samples to request.
+		toRead := space
+		if toRead > chunkSize {
+			toRead = chunkSize
+		}
+
+		bs.mu.Unlock()
+
+		// Read from source WITHOUT holding the lock so disk I/O
+		// does not block the speaker goroutine.
+		n, ok := bs.source.Stream(tmp[:toRead])
+
+		if n > 0 {
+			bs.mu.Lock()
+
+			for i := range n {
+				bs.ring[bs.writPos] = tmp[i]
+				bs.writPos = (bs.writPos + 1) % len(bs.ring)
+			}
+
+			bs.count += n
+			bs.mu.Unlock()
+		}
+
+		if !ok {
+			bs.mu.Lock()
+			bs.done = true
+
+			if srcErr := bs.source.Err(); srcErr != nil {
+				bs.err = srcErr
+			}
+
+			bs.mu.Unlock()
+
+			return
+		}
+
+		// If source returned 0 samples but is still ok, yield
+		// briefly to avoid busy-spinning.
+		if n == 0 {
+			select {
+			case <-bs.closed:
+				return
+			case <-time.After(1 * time.Millisecond):
+			}
+		}
+	}
+}
+
+// Stream copies samples from the ring buffer into the provided
+// slice. If the buffer is temporarily empty but the source is not
+// yet drained, it fills the output with silence and returns
+// (len(samples), true) to avoid speaker underrun.
+func (bs *BufferedStreamer) Stream(
+	samples [][2]float64,
+) (int, bool) {
+	bs.mu.Lock()
+	defer bs.mu.Unlock()
+
+	if bs.count == 0 && bs.done {
+		return 0, false
+	}
+
+	if bs.count == 0 {
+		// Buffer temporarily empty — fill with silence.
+		for i := range samples {
+			samples[i] = [2]float64{}
+		}
+
+		return len(samples), true
+	}
+
+	// Copy available samples from ring buffer.
+	n := len(samples)
+	if n > bs.count {
+		n = bs.count
+	}
+
+	for i := range n {
+		samples[i] = bs.ring[bs.readPos]
+		bs.readPos = (bs.readPos + 1) % len(bs.ring)
+	}
+
+	bs.count -= n
+
+	return n, true
+}
+
+// Err returns any error encountered by the source streamer.
+func (bs *BufferedStreamer) Err() error {
+	bs.mu.Lock()
+	defer bs.mu.Unlock()
+
+	return bs.err
+}
+
+// Close signals the read-ahead goroutine to stop. It is safe to
+// call multiple times.
+func (bs *BufferedStreamer) Close() {
+	select {
+	case <-bs.closed:
+		// Already closed.
+	default:
+		close(bs.closed)
+	}
+}
diff --git a/backend/player/buffered_streamer_test.go b/backend/player/buffered_streamer_test.go
new file mode 100644
index 0000000..2eb4074
--- /dev/null
+++ b/backend/player/buffered_streamer_test.go
@@ -0,0 +1,294 @@
+package player
+
+import (
+	"runtime"
+	"testing"
+	"time"
+
+	"github.com/gopxl/beep/v2"
+)
+
+// slowStreamer wraps a beep.Streamer and introduces a delay before
+// each Stream call, simulating slow disk I/O.
+type slowStreamer struct {
+	inner beep.Streamer
+	delay time.Duration
+}
+
+func (s *slowStreamer) Stream(samples [][2]float64) (int, bool) {
+	time.Sleep(s.delay)
+
+	return s.inner.Stream(samples)
+}
+
+func (s *slowStreamer) Err() error { return s.inner.Err() }
+
+// finiteStreamer produces exactly N samples with incrementing values
+// starting at 1.0 (so sample 0 → 1.0, sample 1 → 2.0, etc.) and
+// then signals end-of-stream. Values start at 1 so they are
+// distinguishable from silence (zero).
+func finiteStreamer(n int) beep.Streamer {
+	pos := 0
+
+	return beep.StreamerFunc(func(samples [][2]float64) (int, bool) {
+		if pos >= n {
+			return 0, false
+		}
+
+		filled := 0
+
+		for i := range samples {
+			if pos >= n {
+				break
+			}
+
+			val := float64(pos + 1) // +1 so first sample is 1.0
+			samples[i] = [2]float64{val, val}
+			pos++
+			filled++
+		}
+
+		return filled, true
+	})
+}
+
+func TestBufferedStreamer_BasicStream(t *testing.T) {
+	const total = 1000
+	src := finiteStreamer(total)
+	bs := NewBufferedStreamer(src, 2048)
+
+	defer bs.Close()
+
+	var collected [][2]float64
+
+	buf := make([][2]float64, 256)
+
+	for {
+		n, ok := bs.Stream(buf)
+
+		for i := range n {
+			// Skip silence frames (buffer not yet filled).
+			if buf[i][0] == 0 && buf[i][1] == 0 && len(collected) == 0 {
+				continue
+			}
+
+			collected = append(collected, buf[i])
+		}
+
+		if !ok {
+			break
+		}
+
+		// Safety valve: if we've collected enough samples plus
+		// extra from potential silence padding, break.
+		if len(collected) >= total {
+			// Drain remaining.
+			for {
+				n, ok = bs.Stream(buf)
+				if !ok {
+					break
+				}
+
+				for i := range n {
+					if buf[i][0] != 0 || buf[i][1] != 0 {
+						collected = append(collected, buf[i])
+					}
+				}
+			}
+
+			break
+		}
+	}
+
+	if len(collected) != total {
+		t.Fatalf(
+			"expected %d samples, got %d", total, len(collected),
+		)
+	}
+
+	// Verify ordering (values start at 1.0).
+	for i, s := range collected {
+		expected := float64(i + 1)
+		if s[0] != expected || s[1] != expected {
+			t.Fatalf(
+				"sample %d: expected [%f %f], got [%f %f]",
+				i, expected, expected, s[0], s[1],
+			)
+		}
+	}
+}
+
+func TestBufferedStreamer_SmallReads(t *testing.T) {
+	const total = 200
+	src := finiteStreamer(total)
+	bs := NewBufferedStreamer(src, 512)
+
+	defer bs.Close()
+
+	// Give read-ahead time to fill.
+	time.Sleep(50 * time.Millisecond)
+
+	var collected [][2]float64
+
+	buf := make([][2]float64, 1) // Read one sample at a time.
+
+	for {
+		n, ok := bs.Stream(buf)
+
+		for i := range n {
+			if buf[i][0] == 0 && buf[i][1] == 0 && len(collected) == 0 {
+				continue
+			}
+
+			collected = append(collected, buf[i])
+		}
+
+		if !ok {
+			break
+		}
+
+		if len(collected) >= total {
+			// Drain.
+			for {
+				n, ok = bs.Stream(buf)
+				if !ok {
+					break
+				}
+
+				for i := range n {
+					if buf[i][0] != 0 || buf[i][1] != 0 {
+						collected = append(collected, buf[i])
+					}
+				}
+			}
+
+			break
+		}
+	}
+
+	if len(collected) != total {
+		t.Fatalf(
+			"expected %d samples, got %d", total, len(collected),
+		)
+	}
+
+	for i, s := range collected {
+		expected := float64(i + 1)
+		if s[0] != expected || s[1] != expected {
+			t.Fatalf(
+				"sample %d: expected [%f %f], got [%f %f]",
+				i, expected, expected, s[0], s[1],
+			)
+		}
+	}
+}
+
+func TestBufferedStreamer_SourceDrained(t *testing.T) {
+	const total = 100
+	src := finiteStreamer(total)
+	bs := NewBufferedStreamer(src, 256)
+
+	defer bs.Close()
+
+	// Wait for read-ahead to completely drain the source.
+	time.Sleep(50 * time.Millisecond)
+
+	// Read all samples out.
+	consumed := 0
+	buf := make([][2]float64, 32)
+	hitEOF := false
+
+	for range 1000 { // Safety limit.
+		n, ok := bs.Stream(buf)
+
+		for i := range n {
+			if buf[i][0] != 0 || buf[i][1] != 0 {
+				consumed++
+			}
+		}
+
+		if !ok {
+			hitEOF = true
+
+			break
+		}
+	}
+
+	if !hitEOF {
+		t.Fatal("expected stream to return ok=false after source drained")
+	}
+
+	if consumed != total {
+		t.Fatalf("expected %d non-zero samples, got %d", total, consumed)
+	}
+}
+
+func TestBufferedStreamer_EmptyBufferReturnsSilence(t *testing.T) {
+	// Use a slow source that sleeps 50ms per call.
+	src := &slowStreamer{
+		inner: finiteStreamer(100),
+		delay: 50 * time.Millisecond,
+	}
+	bs := NewBufferedStreamer(src, 1024)
+
+	defer bs.Close()
+
+	// Immediately call Stream before read-ahead has had time to
+	// fill anything. The buffer should be empty.
+	buf := make([][2]float64, 64)
+	n, ok := bs.Stream(buf)
+
+	if !ok {
+		t.Fatal("expected ok=true when buffer is empty but source not drained")
+	}
+
+	if n != len(buf) {
+		t.Fatalf("expected %d samples (silence), got %d", len(buf), n)
+	}
+
+	// All returned samples should be silence (zeros).
+	for i := range n {
+		if buf[i][0] != 0 || buf[i][1] != 0 {
+			t.Fatalf(
+				"sample %d should be silence, got [%f %f]",
+				i, buf[i][0], buf[i][1],
+			)
+		}
+	}
+}
+
+func TestBufferedStreamer_Close(t *testing.T) {
+	// Use a source that never drains.
+	infinite := beep.StreamerFunc(func(samples [][2]float64) (int, bool) {
+		for i := range samples {
+			samples[i] = [2]float64{1.0, 1.0}
+		}
+
+		return len(samples), true
+	})
+
+	goroutinesBefore := runtime.NumGoroutine()
+	bs := NewBufferedStreamer(infinite, 4096)
+
+	// Let read-ahead goroutine start.
+	time.Sleep(10 * time.Millisecond)
+
+	bs.Close()
+
+	// Wait for goroutine to exit.
+	time.Sleep(50 * time.Millisecond)
+
+	goroutinesAfter := runtime.NumGoroutine()
+
+	// The goroutine count should not have increased. Allow ±1 for
+	// runtime fluctuations.
+	if goroutinesAfter > goroutinesBefore+1 {
+		t.Fatalf(
+			"goroutine leak: before=%d after=%d",
+			goroutinesBefore, goroutinesAfter,
+		)
+	}
+
+	// Calling Close again should not panic.
+	bs.Close()
+}