diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index 62adba41e8..53a9768730 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -861,8 +861,8 @@ static int get_space(void)
     }
     
     ret = snd_pcm_status_get_avail(status) * bytes_per_sample;
-    if (ret > MAX_OUTBURST)
-	    ret = MAX_OUTBURST;
+    if (ret > ao_data.buffersize)  // Buffer underrun?
+	ret = ao_data.buffersize;
     return(ret);
 }