diff --git a/NEWS b/NEWS
index f56f55647..be21282e2 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ ver 0.16.1 (2010/??/??)
 * output:
   - solaris: add missing parameter to open_cloexec() cal
   - osx: fix up audio format first, then apply it to device
+* player_thread: fix assertion failure due to early seek
 
 
 ver 0.16 (2010/12/11)
diff --git a/src/player_thread.c b/src/player_thread.c
index cdcff3f92..776d6667f 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -869,6 +869,10 @@ static void do_play(struct decoder_control *dc)
 			/* seek to the beginning of the range */
 			const struct song *song = decoder_current_song(dc);
 			if (song != NULL && song->start_ms > 0 &&
+			    /* we must not send a seek command until
+			       the decoder is initialized
+			       completely */
+			    !player.decoder_starting &&
 			    !dc_seek(dc, song->start_ms / 1000.0))
 				player_dc_stop(&player);