1 files changed, 3 insertions, 2 deletions

diff --git a/apps/codecs/mod.c b/apps/codecs/mod.c
index 3e2e4284de..4ace721a1e 100644
--- a/apps/codecs/mod.c
+++ b/apps/codecs/mod.c
@@ -1232,8 +1232,8 @@ next_track:
         return CODEC_ERROR;
     }
 
-    while (!*ci->taginfo_ready && !ci->stop_codec)
-        ci->sleep(1);
+    if (codec_wait_taginfo() != 0)
+        goto request_next_track;
 
     codec_set_replaygain(ci->id3);
 
@@ -1305,6 +1305,7 @@ next_track:
 
     }
 
+request_next_track:
     if (ci->request_next_track())
         goto next_track;