diff --git a/src/output/OutputThread.cxx b/src/output/OutputThread.cxx
index af31e5f9f..3e3cccb9f 100644
--- a/src/output/OutputThread.cxx
+++ b/src/output/OutputThread.cxx
@@ -493,7 +493,10 @@ AudioOutput::Play()
 		in_playback_loop = false;
 	};
 
-	while (chunk != nullptr && command == Command::NONE) {
+	while (chunk != nullptr) {
+		if (command != Command::NONE)
+			return true;
+
 		if (!PlayChunk(chunk))
 			break;