1 files changed, 3 insertions, 0 deletions

diff --git a/apps/playlist.c b/apps/playlist.c
index 46556bff12..e8239b21f2 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -2256,7 +2256,10 @@ int playlist_next(int steps)
                         ft_build_playlist(tree_get_context(), 0);
                         if (global_settings.playlist_shuffle)
                             playlist_shuffle(current_tick, -1);                    
+#if CONFIG_CODEC != SWCODEC
                         playlist_start(0, 0);
+#endif
+                        playlist->index = 0;
                         index = 0;
                     }
                 }