diff --git a/NEWS b/NEWS
index 000761176..8c2b0f50e 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ ver 0.15.8 (2009/??/??)
 * decoders:
   - ffmpeg, flac, vorbis: added more flac/vorbis MIME types
 * dbUtils: return empty tag value only if no value was found
+* decoder_thread: fix CUE track playback
 
 
 ver 0.15.7 (2009/12/27)
diff --git a/src/decoder_thread.c b/src/decoder_thread.c
index d6ff058ec..cbb670616 100644
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -89,7 +89,8 @@ static void decoder_run_song(const struct song *song, const char *uri)
 	struct input_stream input_stream;
 	const struct decoder_plugin *plugin;
 
-	if (!input_stream_open(&input_stream, uri)) {
+	close_instream = input_stream_open(&input_stream, uri);
+	if (!close_instream && !song_is_file(song)) {
 		dc.state = DECODE_STATE_ERROR;
 		return;
 	}
@@ -108,7 +109,7 @@ static void decoder_run_song(const struct song *song, const char *uri)
 	/* wait for the input stream to become ready; its metadata
 	   will be available then */
 
-	while (!input_stream.ready) {
+	while (close_instream && !input_stream.ready) {
 		if (dc.command == DECODE_COMMAND_STOP) {
 			input_stream_close(&input_stream);
 			dc.state = DECODE_STATE_STOP;
@@ -124,7 +125,8 @@ static void decoder_run_song(const struct song *song, const char *uri)
 	}
 
 	if (dc.command == DECODE_COMMAND_STOP) {
-		input_stream_close(&input_stream);
+		if (close_instream)
+			input_stream_close(&input_stream);
 		dc.state = DECODE_STATE_STOP;
 		return;
 	}
@@ -179,8 +181,11 @@ static void decoder_run_song(const struct song *song, const char *uri)
 		const char *s = uri_get_suffix(uri);
 		while ((plugin = decoder_plugin_from_suffix(s, next++))) {
 			if (plugin->file_decode != NULL) {
-				input_stream_close(&input_stream);
-				close_instream = false;
+				if (close_instream) {
+					input_stream_close(&input_stream);
+					close_instream = false;
+				}
+
 				ret = decoder_file_decode(plugin,
 							  &decoder, uri);
 				if (ret)