diff --git a/apps/playback.c b/apps/playback.c
index e0358cfbac..8ac669c172 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -2984,10 +2984,10 @@ static void audio_stop_playback(void)
             (playlist_end && ci.stop_codec)?NULL:audio_current_track());
     }
 
-    playing = false;
     filling = false;
     paused = false;
     audio_stop_codec_flush();
+    playing = false;
     
     if (current_fd >= 0) 
     {
diff --git a/docs/CREDITS b/docs/CREDITS
index 7e3ee72a74..14dc1c4769 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -241,3 +241,4 @@ Thilo-Alexander Ginkel
 Adam Gashlin
 Robert Kukla
 David Quesada
+Jared Stafford