diff --git a/src/player_thread.c b/src/player_thread.c
index 8f8466fc8..32d35f309 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -819,7 +819,9 @@ static void do_play(struct decoder_control *dc)
 
 		if (player.paused) {
 			player_lock();
-			player_wait();
+
+			if (pc.command == PLAYER_COMMAND_NONE)
+				player_wait();
 			continue;
 		} else if (music_pipe_size(player.pipe) > 0) {
 			/* at least one music chunk is ready - send it