1 files changed, 5 insertions, 0 deletions

diff --git a/apps/playback.c b/apps/playback.c
index 1e6bfa5fe7..ecfb93363e 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1836,6 +1836,11 @@ static void audio_stop_playback(void)
         playlist_update_resume_info(
             (playlist_end && ci.stop_codec)?NULL:audio_current_track());
     }
+
+    if (voice_is_playing)
+        while (voice_is_playing || !queue_empty(&voice_codec_queue))
+            yield();
+
     filebufused = 0;
     playing = false;
     filling = false;