diff --git a/src/player/Thread.cxx b/src/player/Thread.cxx
index 613e1ef94..a08caca2e 100644
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -213,6 +213,11 @@ private:
 	bool WaitDecoderStartup() {
 		while (decoder_starting) {
 			if (!CheckDecoderStartup()) {
+				/* if decoder startup fails, make sure
+				   the previous song is not being
+				   played anymore */
+				pc.outputs.Cancel();
+
 				pc.LockCommandFinished();
 				return false;
 			}