1 files changed, 5 insertions, 1 deletions
diff --git a/src/player_thread.c b/src/player_thread.c
index 352ceabae..f6069b048 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -92,7 +92,6 @@ static void player_stop_decoder(void)
 {
 	dc_stop(&pc.notify);
 	pc.state = PLAYER_STATE_STOP;
-	pc.next_song = NULL;
 	event_pipe_emit(PIPE_EVENT_PLAYLIST);
 }
 
@@ -511,6 +510,11 @@ static void do_play(void)
 		}
 	}
 
+	if (player.queued) {
+		assert(pc.next_song != NULL);
+		pc.next_song = NULL;
+	}
+
 	player_stop_decoder();
 }