diff --git a/src/output_thread.c b/src/output_thread.c
index 786b04204..846f5e60e 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -87,7 +87,7 @@ ao_play_chunk(struct audio_output *ao, const struct music_chunk *chunk)
 			return true;
 	}
 
-	while (size > 0) {
+	while (size > 0 && ao->command == AO_COMMAND_NONE) {
 		size_t nbytes;
 
 		nbytes = ao_plugin_play(ao->plugin, ao->data, data, size,