diff --git a/src/player/Thread.cxx b/src/player/Thread.cxx
index 73b90d2a3..14f8aa08e 100644
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -937,10 +937,7 @@ Player::Run() noexcept
 
 	pc.CommandFinished();
 
-	while (true) {
-		if (!ProcessCommand())
-			break;
-
+	while (ProcessCommand()) {
 		if (buffering) {
 			/* buffering at the start of the song - wait
 			   until the buffer is large enough, to