diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 2ece3a0ac7..4323cd2c6e 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -1047,7 +1047,8 @@ static bool playback_settings_menu(void)
     result = menu_run(m);
     menu_exit(m);
 
-    if (old_shuffle != global_settings.playlist_shuffle)
+    if ((old_shuffle != global_settings.playlist_shuffle) 
+        && (audio_status() & AUDIO_STATUS_PLAY))
     {
         if (global_settings.playlist_shuffle)
         {