diff --git a/RedBookPlayer/Player.cs b/RedBookPlayer/Player.cs
index ebb3652..2e9a8f2 100644
--- a/RedBookPlayer/Player.cs
+++ b/RedBookPlayer/Player.cs
@@ -104,7 +104,7 @@ namespace RedBookPlayer
         BiQuadFilter deEmphasisFilterRight;
         bool readingImage = false;
 
-        public async void Init(AaruFormat image)
+        public async void Init(AaruFormat image, bool autoPlay = false)
         {
             this.Image = image;
 
@@ -152,7 +152,10 @@ namespace RedBookPlayer
 
             soundOut = new ALSoundOut(50);
             soundOut.Initialize(source);
-            soundOut.Play();
+            if (autoPlay)
+            {
+                soundOut.Play();
+            }
 
             LoadTrack(CurrentTrack);
 
diff --git a/RedBookPlayer/PlayerView.xaml.cs b/RedBookPlayer/PlayerView.xaml.cs
index 3e31d7a..f1d8bcb 100644
--- a/RedBookPlayer/PlayerView.xaml.cs
+++ b/RedBookPlayer/PlayerView.xaml.cs
@@ -53,7 +53,7 @@ namespace RedBookPlayer
 
                 player?.Shutdown();
                 player = new Player();
-                player.Init(image);
+                player.Init(image, App.Settings.AutoPlay);
             });
 
             await Dispatcher.UIThread.InvokeAsync(() =>